gentoo auto-resync : 02:10:2022 - 01:11:51

3 files changed, 7 insertions, 22 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index a566262b0985..bc785acfd9a7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,6 @@
 DIST mesa-22.1.7.tar.xz 16109944 BLAKE2B 0d4724068eff0ad242e81808ff94b73e1b5da810d27706b5a594ad77875b54562db6d9f752b61bcfff773b26bbc64b751d4dd13cfa256106d3114377ea668d26 SHA512 447e87359445edce231761d94b316b2aa20e9ab58e4b59d75cbb1696dd0900e7164c32bebc3b75700b4070570b456f7a8cf0914181371754a52427d34e4b9120
 DIST mesa-22.2.0.tar.xz 16298808 BLAKE2B 3f1526626edad49a7d1551283eaab38d905cdd4c70b487538cc2c4de50a4959e396340abe9acb32742ca83fee0a64fcce646c7fcd67d3650eacee8398c289126 SHA512 13a21b9ed6b0a5dfd0293b73df271a929c3155d83e8beb3d958fe18d79277f3611bf5b26a1186d446f4e1479a36bb13d0a13d6ac68937989fe7a0d917e12171e
 EBUILD mesa-22.1.7.ebuild 12035 BLAKE2B e24591c2f8efa0678fcb47a29b2f126b807d5beff1e4d7b95a8b2ab66d05c6266dc2e648d1d4ef7d34ef6723d78bc40e8ea836bd442c809c66d52d96dad1f787 SHA512 eb06f57c2c628cb1d76fa6aea618936ccd957cc66b845d2b8fc4c14f68b0dea2595cdcc052e659b27618726b4ceba89ba7f6793d0ed01c0a419a6161108ff4b3
-EBUILD mesa-22.2.0.ebuild 12635 BLAKE2B 24a771be35187dab4f3d6cf72b1454279cdb77bb8bd2081daed5952fa2dc1702663d3167375505cda93c9498ca703cc98a850434a3ab548e6bc9ccfdc37ca663 SHA512 a91a0788612a7d5e49744bb430d4ca77087a27497ab6d1bde4e618d6e56225f57b6443791f7e0958c3b7a19a05ab6524eb5ac36ad23a8b7e2474f42bb0715adb
-EBUILD mesa-9999.ebuild 12635 BLAKE2B 24a771be35187dab4f3d6cf72b1454279cdb77bb8bd2081daed5952fa2dc1702663d3167375505cda93c9498ca703cc98a850434a3ab548e6bc9ccfdc37ca663 SHA512 a91a0788612a7d5e49744bb430d4ca77087a27497ab6d1bde4e618d6e56225f57b6443791f7e0958c3b7a19a05ab6524eb5ac36ad23a8b7e2474f42bb0715adb
+EBUILD mesa-22.2.0.ebuild 12610 BLAKE2B 2e4e3799c9e3c787dee04d2b3010da9778edcab5a8dc87cb47ed5e3f2565ea7617c1f8c5e56fbc29e1432552eba85a0d988385b263efd38c35a9504b5ddd8b15 SHA512 59bcda721079c68692c94e74c59bf36249eb1181a9f5eeba177b795f17e19dc803982cc9dece1c6a17413a718cec8ea02680bd9e8aa4ec1c4389095535d4ebfe
+EBUILD mesa-9999.ebuild 12245 BLAKE2B 0c07302acf6b612bd82ca3bf7eac7a469e636925c73f9fd278bb0e29dc598f3a7a716f1a51d53d2c715542dd8bc69509d8e728e440dc4b8ef2488c90f1d8c419 SHA512 f83553b5e7c7852d418c9d75fc05279877942226bb33ae78f76bf4ed54c763d1ce9cc16b7c176efb568c088f09c2a44cae36ddbde40cc8da2e68ea656e9393e9
 MISC metadata.xml 1649 BLAKE2B dbbaf2c16c29d6b75e272a403f59f943047fc6d19361b289d7a31bffeeed73d7ee6b16acb4a481b8e647b807fd3b4a7354092a52cc55edccb722180eae124370 SHA512 e0f05c43af12b12142eb4fa08b4e5a103bc160554836d614aaa56928b41d5f7160dd1e89e78d54df6ee6e3bb0e4d9d7667402af3dd2e7051e09b17506caf7985
diff --git a/media-libs/mesa/mesa-22.2.0.ebuild b/media-libs/mesa/mesa-22.2.0.ebuild
index b67f1493125c..ca85f615d85a 100644
--- a/media-libs/mesa/mesa-22.2.0.ebuild
+++ b/media-libs/mesa/mesa-22.2.0.ebuild
@@ -75,13 +75,11 @@ RDEPEND="
 		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
 	)
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
@@ -194,6 +192,8 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) )
+	vulkan-overlay? ( dev-util/glslang )
 	wayland? ( dev-util/wayland-scanner )
 "
 
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b67f1493125c..72724b3f5546 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -34,7 +34,7 @@ IUSE="${IUSE_VIDEO_CARDS}
 	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
 	lm-sensors opencl osmesa +proprietary-codecs selinux
 	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
+	vulkan-overlay wayland +X xa zink +zstd"
 
 REQUIRED_USE="
 	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -44,7 +44,6 @@ REQUIRED_USE="
 	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_radeonsi?   ( llvm )
 	xa? ( X )
-	xvmc? ( X )
 	zink? ( vulkan )
 "
 
@@ -75,13 +74,11 @@ RDEPEND="
 		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
 	)
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
@@ -194,6 +191,8 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) )
+	vulkan-overlay? ( dev-util/glslang )
 	wayland? ( dev-util/wayland-scanner )
 "
 
@@ -268,13 +267,6 @@ pkg_pretend() {
 		fi
 	fi
 
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
 	if ! use llvm; then
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
 	fi
@@ -366,13 +358,6 @@ multilib_src_configure() {
 		emesonargs+=(-Dgallium-xa=disabled)
 	fi
 
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
 	if use video_cards_freedreno ||
 	   use video_cards_lima ||
 	   use video_cards_panfrost ||