media-tv/kodi: Update mesa dependency

Signed-off-by: Matt Turner <mattst88@gentoo.org>

6 files changed, 36 insertions, 9 deletions

diff --git a/media-tv/kodi/kodi-19.5-r1.ebuild b/media-tv/kodi/kodi-19.5-r2.ebuild
index d71c4c2b4261..7b7a084a897d 100644
--- a/media-tv/kodi/kodi-19.5-r1.ebuild
+++ b/media-tv/kodi/kodi-19.5-r2.ebuild
@@ -97,7 +97,12 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		x11-libs/libxkbcommon
 	)
 	gles? (
-		!raspberry-pi? ( media-libs/mesa[gles2] )
+		!raspberry-pi? (
+			|| (
+				>=media-libs/mesa-24.1.0_rc1[opengl]
+				<media-libs/mesa-24.1.0_rc1[gles2]
+			)
+		)
 	)
 	lcms? ( media-libs/lcms:2 )
 	libusb? ( virtual/libusb:1 )
@@ -122,7 +127,12 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	!gles? ( media-libs/glu )
 	>=dev-libs/openssl-1.1.1k:0=
 	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] )
+		|| (
+			media-libs/raspberrypi-userland
+			media-libs/raspberrypi-userland-bin
+			>=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4]
+			<media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4]
+		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
diff --git a/media-tv/kodi/kodi-20.3.ebuild b/media-tv/kodi/kodi-20.3-r1.ebuild
index 2270760f2e9f..a518af43864c 100644
--- a/media-tv/kodi/kodi-20.3.ebuild
+++ b/media-tv/kodi/kodi-20.3-r1.ebuild
@@ -149,7 +149,10 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	)
 	gles? (
 		!raspberry-pi? (
-			media-libs/mesa[gles2]
+			|| (
+				>=media-libs/mesa-24.1.0_rc1[opengl]
+				<media-libs/mesa-24.1.0_rc1[gles2]
+			)
 		)
 	)
 	!gles? (
@@ -183,7 +186,8 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		|| (
 			media-libs/raspberrypi-userland
 			media-libs/raspberrypi-userland-bin
-			media-libs/mesa[gles2,video_cards_vc4]
+			>=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4]
+			<media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4]
 		)
 	)
 	samba? (
diff --git a/media-tv/kodi/kodi-20.5.ebuild b/media-tv/kodi/kodi-20.5-r1.ebuild
index 2270760f2e9f..a518af43864c 100644
--- a/media-tv/kodi/kodi-20.5.ebuild
+++ b/media-tv/kodi/kodi-20.5-r1.ebuild
@@ -149,7 +149,10 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	)
 	gles? (
 		!raspberry-pi? (
-			media-libs/mesa[gles2]
+			|| (
+				>=media-libs/mesa-24.1.0_rc1[opengl]
+				<media-libs/mesa-24.1.0_rc1[gles2]
+			)
 		)
 	)
 	!gles? (
@@ -183,7 +186,8 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		|| (
 			media-libs/raspberrypi-userland
 			media-libs/raspberrypi-userland-bin
-			media-libs/mesa[gles2,video_cards_vc4]
+			>=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4]
+			<media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4]
 		)
 	)
 	samba? (
diff --git a/media-tv/kodi/kodi-21.0.ebuild b/media-tv/kodi/kodi-21.0-r1.ebuild
index 67eca7afe6c1..bdc7176cb631 100644
--- a/media-tv/kodi/kodi-21.0.ebuild
+++ b/media-tv/kodi/kodi-21.0-r1.ebuild
@@ -159,7 +159,10 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		x11-libs/libxkbcommon
 	)
 	gles? (
-		media-libs/mesa[gles2]
+		|| (
+			>=media-libs/mesa-24.1.0_rc1[opengl]
+			<media-libs/mesa-24.1.0_rc1[gles2]
+		)
 	)
 	!gles? (
 		media-libs/glu
diff --git a/media-tv/kodi/kodi-21.9999.ebuild b/media-tv/kodi/kodi-21.9999.ebuild
index a7ad762133ea..7ca90c8d20dd 100644
--- a/media-tv/kodi/kodi-21.9999.ebuild
+++ b/media-tv/kodi/kodi-21.9999.ebuild
@@ -159,7 +159,10 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		x11-libs/libxkbcommon
 	)
 	gles? (
-		media-libs/mesa[gles2]
+		|| (
+			>=media-libs/mesa-24.1.0_rc1[opengl]
+			<media-libs/mesa-24.1.0_rc1[gles2]
+		)
 	)
 	!gles? (
 		media-libs/glu
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index ec93101fdd4d..be645e574764 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -159,7 +159,10 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		x11-libs/libxkbcommon
 	)
 	gles? (
-		media-libs/mesa[gles2]
+		|| (
+			>=media-libs/mesa-24.1.0_rc1[opengl]
+			<media-libs/mesa-24.1.0_rc1[gles2]
+		)
 	)
 	!gles? (
 		media-libs/glu