gentoo auto-resync : 04:05:2023 - 23:29:09

6 files changed, 21 insertions, 3 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f5ab8881a348..43a0ab3f8a53 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 283469e71f17..68b4704e8be7 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -6,5 +6,5 @@ DIST ffmpeg-chromium-106.tar.xz 9707176 BLAKE2B 8ab9b006328e15faa38b8014f2870e7a
 DIST ffmpeg-chromium-112.tar.xz 9888952 BLAKE2B 48a2e0e93a890ae3ec436b2c9504c6f5d063c2ed04ed67db9c8b17f1d1111ce56519a8af8c44635901de7f46fb2f0529818e70874a17432c64c1192968a3ae4b SHA512 f0d5e7cd77d5daeddf1c2d47b3435bf9306fdbf23239890cbbaef86ad6e462e9606da5282c39dcd5f32ac6a721b5dd5f01c1f1525f6a66a0dad8a927db2c3217
 EBUILD ffmpeg-chromium-102.ebuild 6595 BLAKE2B 2470806a5aaaff46584f4fbceb00354455f3469380cf0078503774326cb0517801c1f00787ff5264a5b7f601d64c03fe2c460b43b021b918b135169cdc49cfd1 SHA512 43daadcde541fd9bcc53b49299dae69f560a23b961bed4e626f2df794523f16077b7812a61c205a8b6584cb3ddca48481d735b6508e8a81c54f29b773fce143c
 EBUILD ffmpeg-chromium-106.ebuild 6391 BLAKE2B c4a9a8bed4ad5cf0c0d9d278256d13dab81400d5ecf31ce397a9482bccfb8203bf48a3791c2e758a50b5e71901202e0a675cbf8c5e65e707a3d42f2a24515f2f SHA512 9fe6f096d9264e7efbe5d266e7bdcd2ce07d5554803c5a97818ca0dd694904f2d5704dc3c76b1ac70a5b030d2b3908b4eb5972c7d3fdd45e55fe196c72999647
-EBUILD ffmpeg-chromium-112.ebuild 6354 BLAKE2B f71c48e4c45a0a160d63b74de06e42b0d5aa2854022a41cc179175db92e30745b6cf2d8c2fe9a5918849e89b07b94396fa4b8468c5f40130b060803aa8f64f2a SHA512 b1e1b837429fd2271ac6e3093399cae02034e6d8a9cc005b207f760d0570642d357f555ad51fe094c17b3f287af9acbd86459a29aa8c83ea4448d9ced1c89f0a
+EBUILD ffmpeg-chromium-112.ebuild 6353 BLAKE2B 372428213b1a22287ef095e360a3627d95e7e23698ea17d8e526cc2047e7d1d883f0ab42bc90eb72d601f7e75eaad22cfad50dab5b9d58229c89af3e5ec0b0af SHA512 8401ae58de838f275e3c0ad4e5eb7f86d792d3053377cc6f3bf384c68ce857af87ee961c84bafff445594be8f453ff934ca8462b6ad47b1778228e727dd5404f
 MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-112.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-112.ebuild
index 04db7f5c85c7..7549abb318be 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-112.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-112.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 	gpl? ( GPL-2 )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 # Options to use as use_enable in the foo[:bar] form.
 # This will feed configure with $(use_enable foo bar)
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index be0e40563ea2..23f9a8f376aa 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,7 +1,8 @@
 AUX qmplay2-22.10.23-fix-includes.patch 869 BLAKE2B e84d97476114c0b48930530ebeaf90032af650080ac517d78986dfe443bf9beb0e128381c39880a78df1762eb85e51f0eab5275d7b148e631138e50d656ec33b SHA512 05025c688e7885c10856669b4e943daf54dfd9580d1e4ae77d344ac0d7ab97856b588e6765ae5a4cdbf7508d24e8affaf897efb01d0c328679b2916f98a3405a
+AUX qmplay2-23.02.05-fix-libva-glx.patch 619 BLAKE2B c3aeeb812c6012bd4627b984f2fb769e88897030f9f73920102d0e95c179773854ab58002cc97b2df4ba1cea317d725a1a8e0e180143677f16067d6f96a32c73 SHA512 1ae7ab4b443e3ab439fe33748c33484f1d83a20a39d5c9c14a292c9327a4bcd2b1e0c3c456bb82aff6fca84a3e9039174e6f4d2e0beeba3b2427acbd3c389c80
 DIST QMPlay2-src-22.10.23.tar.xz 1414804 BLAKE2B c0db1187538be8ab0806abd41fbfdae5a71dda450505af1956989a3ccc10fa52997b8652f280cd66837d12a84a7a058783b65df3d4bd35665c92f1262cd8d004 SHA512 80c9408a9085084857b5b433f009bf62784cf73ceb90218ec09132be227aae97136095811ffa1211375dcbfc1f51cbefaa3690c56fc8df51d9b1cf022ce0709f
 DIST QMPlay2-src-23.02.05.tar.xz 1428992 BLAKE2B 7296ed089306e50e1051c33c23dae30f14cbb166b9d9ea8c184e8aa027a261a658e1d7770c7d574784a5cde4890c66e2104927f4473f484562378c956bea4b3f SHA512 d2e998a2df08c98b7e0232de693ee17b5c703793e2b1edadde300ca39998f40f7ad58b5850ee1f8cddf1dd9489c7f96e664db7e9deba01a612d97707aad849c0
 EBUILD qmplay2-22.10.23.ebuild 3381 BLAKE2B 7fe62b58b88d5b42dc91c1984aa8c1d1964611c7224e258b7413af8c8d71b57408332b4c235ca82bb489896d9c223c3bd496ba2f7ae05d07542f2fd88523ec45 SHA512 582a316117b54870686c734c6ddc283c8102881502e8dfc4d0e6f4ad1f918431361694cab88b2206f75afc07e318aaa2b13ea7d19abcfd21fc3578c5ea4fa19f
-EBUILD qmplay2-23.02.05.ebuild 3329 BLAKE2B 8ee6746e3bf7521a86e519491084cb964a30d1a43bf9a12a5ace5e75226fc16b95f783067b5fa1fda7f7c14d711e9e961f1e53e78edeff391e0bdf97ec5d6985 SHA512 54e5c6b36f2083897a32d1deaddfe9f82db484fa9c348cf3ffacc2da31d220c04a470ff33d6811f602f42d9b0116e9c1eebf5a231d25fb0b3ce345136495e795
+EBUILD qmplay2-23.02.05.ebuild 3392 BLAKE2B 1e1fa20b9fd2dceae2398761d6b2fa416f6f93175277185c7de3649297c40c74846fb9663639660bb78403ae009edaa61a043f7c8f209ca81d32f7c7eb34a897 SHA512 4bc90041cdc1e869d4047241947be06157eae7eb64ea999260d0dcafc1042df5551e1d753d6db9be05bb04f858906743d19898f1be28d8c5e3fb2e961580a364
 EBUILD qmplay2-9999.ebuild 3326 BLAKE2B f5038c99fbd446e8ed67ec09a14bf45823618b8d30f415baedb71b5ec72274c20f5c91ec42e230419dec45a610572de80bb9a1a079853c258f24224a7014b5fa SHA512 83d6efceca7050ed8df053488cbf0b19004daa6d0723602bb5cd408b1653515ea980bcc5b295f95bfdeb6f46b38a1e92c5dc0a989a26de67dc00386e50993789
 MISC metadata.xml 1342 BLAKE2B c3e3b0477c49c00aec65e05ec5d940f8fc126efe074460a1f67c39b98654ccc3819669e47ad5ba83ed977a72f9ee41606d9409ef3a377cfb511bdc01aff0ce70 SHA512 2eb6b7c2b72abf37a2165f35ed7cab51653a425d294f4ec866d0c6b4dd53ffbf8b30306a987bb4bba1e952ea246815dc59e22a6e9141151a844ae1b7cbd36bde
diff --git a/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch b/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch
new file mode 100644
index 000000000000..e47aacf22a5f
--- /dev/null
+++ b/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/905453
+
+--- a/src/modules/FFmpeg/CMakeLists.txt
++++ b/src/modules/FFmpeg/CMakeLists.txt
+@@ -67,7 +67,7 @@ if(USE_FFMPEG_VAAPI OR USE_FFMPEG_VDPAU OR USE_FFMPEG_DXVA2 OR USE_FFMPEG_D3D11V
+             list(APPEND FFmpeg_HDR VAAPIVulkan.hpp)
+             list(APPEND FFmpeg_SRC VAAPIVulkan.cpp)
+         endif()
+-        pkg_check_modules(LBVA REQUIRED libva libva-glx libva-drm egl)
++        pkg_check_modules(LBVA REQUIRED libva libva-drm egl)
+         include_directories(${LBVA_INCLUDE_DIRS})
+         link_directories(${LBVA_LIBRARY_DIRS})
+         list(APPEND FFmpeg_LIBS ${LBVA_LIBRARIES})
diff --git a/media-video/qmplay2/qmplay2-23.02.05.ebuild b/media-video/qmplay2/qmplay2-23.02.05.ebuild
index 83acd1b1df36..04d454c891d3 100644
--- a/media-video/qmplay2/qmplay2-23.02.05.ebuild
+++ b/media-video/qmplay2/qmplay2-23.02.05.ebuild
@@ -66,6 +66,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-23.02.05-fix-libva-glx.patch"
+)
+
 src_prepare() {
 	# disable compress man pages
 	sed -r \