gentoo auto-resync : 17:04:2023 - 05:52:08

14 files changed, 64 insertions, 256 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 97468471a529..6e9890f7581a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 7ddc48c50f3f..680483cb5ebd 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -3,5 +3,5 @@ DIST libass-0.16.0.tar.xz.asc 228 BLAKE2B 78596aa961939f16ab0de76a040038bb299591
 DIST libass-0.17.1.tar.xz 403160 BLAKE2B b191e8910ddb3e41fb9df79b27517a127c0da2ad74c0a81920bc2cf8843ab18b02a60738024fa8d3594b91bd26ec6ea7f87e17ca5e07825a6017dd29d2b72b32 SHA512 437b4b60db2626e48f438b5138ab4dbf2c2ab4c8f0b587a6e554510c6719544ef2235c601ff1e482d020410f9bab95ad1a9b176d19a3bd54880499a576b41f23
 DIST libass-0.17.1.tar.xz.asc 228 BLAKE2B 0e70c104438be4409239f435d7872737fde1aba4485816ad0e35f0de743ee303662e66334425d0d511af4974e03443ba6d33ac44f941de9b0da17a56f204edea SHA512 a28c8271b4c5b5756620be9baf81b0262eb71c4f20d1aadb24238d1d0ccba44fdb3b25d788a3f7c9039945431a3d31842a7855660cc28a0a8acc36ff8f0c0298
 EBUILD libass-0.16.0.ebuild 1406 BLAKE2B 92357824f79e7968911f544d0ddcd14242c2f799843a690c7c8fa87dbebf14efec14ee29723e026083d0d617dc6bb471820626a48385be0f6d4d3705410b00ef SHA512 c56a7894b77ebcd6870d77a655e4fdf1f629be779d6d99a15b349ba855174c4cf84df7588bba549aa47171ca75b2ceff6c4f6670282965148827c1e083e85fa8
-EBUILD libass-0.17.1.ebuild 1518 BLAKE2B 370e15c5685e71bccb3609e6c1fef72e1cbb26d6fa8c5432ba5e99c86e8ef75fa06f2ac81c5ef12f328357a87425c9334ecfa0b96bd38c6bfcd27f30ade0bc04 SHA512 5960b3766d73d9fb5b946826b9ae62ba976b81411bda6583806863a3f071f08d07c414bb55c8171c288ff3b146b1399630f4cbcbd952af200d3c2b86fa9378d7
+EBUILD libass-0.17.1.ebuild 1517 BLAKE2B c385ad05a28f093fae258281c6262fb3de6bc66bc8b5e5cf7ee3072536b9d160d9b1d19108f9802c778c58d10369a88ceda9ffccd06686dd48894154983d2ce7 SHA512 1d8916288195151da7e618d7c825c16d2471a1e0029dbd358c9c995e33175f725224ccb043fdd1477d311b2df9da19f951a400147312b2a92ed554b56b403e0b
 MISC metadata.xml 310 BLAKE2B 32f2b0eb7f05223e3d092b3d75b7b1095afdac6dc322bd21fc8d32b6089cfccdc46300801e9d7566269fc0fb54780b6c1efff6e41be8de0aa31b26bdc52a44fd SHA512 97c76a4e387bbf43b14bf7799fe889c27e74e8e0b18c2027fc0c365e25ec5186ead530afe6d8e4d6b95440f0cb781d7ebc46e1eae1cc7b2161a199d38bd2a186
diff --git a/media-libs/libass/libass-0.17.1.ebuild b/media-libs/libass/libass-0.17.1.ebuild
index 2edae7ac0760..507e23173a87 100644
--- a/media-libs/libass/libass-0.17.1.ebuild
+++ b/media-libs/libass/libass-0.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index cdf0c888ecbf..b665615a36c0 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,6 +1,6 @@
 DIST libva-2.17.0.tar.gz 276993 BLAKE2B 4d003f6649e4356a06438f8a88a5a549e94b12f342b1b72649b17d0aeb259ec7f26c3d1b5d21ca6cfc2b31141e01449ccc94a6bfdf2716976cbc80f63091fcfe SHA512 c9f841b4f35e732bfaa0358fe031207f011be90f95cc46acfd8c83092510cf68fe0921f28ce82402e7cce65f263eeb4d06cc17fd3c525274530a53b212f33779
 DIST libva-2.18.0.tar.gz 278493 BLAKE2B 619a1dcb9aaa71b38ec7be500adf6b526f50ae20fa76d1c5ac750229e03a2d5b82dabe334cf07c0f539c1b079829f2ec000ce6570e05e6e18fbf7415c5d5b9b3 SHA512 12e8d837604d2f354d849a8adc84281ae1ecfd2433f1b7dc8e28b5d703ada42b4a84b2b3870e8d2397b77d0d9741afe3bc04d25b4426531805aeb72defaac7ad
 EBUILD libva-2.17.0.ebuild 1719 BLAKE2B d8745a3f8b92c9f61310f61307ef9eb90adbbba4440c2b8a86894d810b22c59d1ff98da3bee803f8446d821fb4aebe06862d142f1563d65968dc76906b4ba853 SHA512 3045261c46456b48a598449cfb7a6b6ed2d5faee979fe87cd3d39fc9f2ab124c302fb8134d70a5a0a4a4994b07b9734ad398947b981437b968ccfb89b1580905
-EBUILD libva-2.18.0.ebuild 1694 BLAKE2B 8b840e15759fdaf967f93ce93b3cb36dbaa230ec427bb2d06d33b7e47d42dc216b014d4fcd382b5c44930a6826736c43f1040aa933bad9e7cc64c9208876ccce SHA512 ef471970a85be2d065cdaf32ec560a637f0e2f93fb1a1ad3ddd58b0788836278f2ba9789e5b0c500a6e1b58bf55f0b973a72fe214a929d11ea1fb54c4fe16ad9
-EBUILD libva-9999.ebuild 1694 BLAKE2B 8b840e15759fdaf967f93ce93b3cb36dbaa230ec427bb2d06d33b7e47d42dc216b014d4fcd382b5c44930a6826736c43f1040aa933bad9e7cc64c9208876ccce SHA512 ef471970a85be2d065cdaf32ec560a637f0e2f93fb1a1ad3ddd58b0788836278f2ba9789e5b0c500a6e1b58bf55f0b973a72fe214a929d11ea1fb54c4fe16ad9
+EBUILD libva-2.18.0-r1.ebuild 1545 BLAKE2B 6fdf54255522daed04b98f8197fab60de24d5135033a2bf06e4a1e51216475c44629297bce8dcbca8c5ef28ad59002f861a3f42ce581f2ebef80980ffff4f81c SHA512 e0184e6812ce5255b3260215c3d168d4a9e1978c3b8ec6e10cbbb9c15695996475f97825fead54c622e0cff98989f46bc4b1aba0d07d0f9f03f1c357444496ed
+EBUILD libva-9999.ebuild 1545 BLAKE2B 6fdf54255522daed04b98f8197fab60de24d5135033a2bf06e4a1e51216475c44629297bce8dcbca8c5ef28ad59002f861a3f42ce581f2ebef80980ffff4f81c SHA512 e0184e6812ce5255b3260215c3d168d4a9e1978c3b8ec6e10cbbb9c15695996475f97825fead54c622e0cff98989f46bc4b1aba0d07d0f9f03f1c357444496ed
 MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
diff --git a/media-libs/libva/libva-2.18.0.ebuild b/media-libs/libva/libva-2.18.0-r1.ebuild
index ef0203c92e12..4f264beeabed 100644
--- a/media-libs/libva/libva-2.18.0.ebuild
+++ b/media-libs/libva/libva-2.18.0-r1.ebuild
@@ -19,8 +19,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="opengl wayland X"
-REQUIRED_USE="opengl? ( X )"
+IUSE="wayland X"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -28,7 +27,6 @@ RDEPEND="
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
@@ -42,11 +40,9 @@ BDEPEND="
 "
 
 MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/va/va_backend_glx.h
 	/usr/include/va/va_x11.h
 	/usr/include/va/va_dri2.h
 	/usr/include/va/va_dricommon.h
-	/usr/include/va/va_glx.h
 )
 
 multilib_src_configure() {
@@ -54,7 +50,7 @@ multilib_src_configure() {
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
 		-Ddisable_drm=false
 		-Dwith_x11=$(usex X)
-		-Dwith_glx=$(usex X)
+		-Dwith_glx=no
 		-Dwith_wayland=$(usex wayland)
 		-Denable_docs=false
 	)
diff --git a/media-libs/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild
index ef0203c92e12..4f264beeabed 100644
--- a/media-libs/libva/libva-9999.ebuild
+++ b/media-libs/libva/libva-9999.ebuild
@@ -19,8 +19,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="opengl wayland X"
-REQUIRED_USE="opengl? ( X )"
+IUSE="wayland X"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -28,7 +27,6 @@ RDEPEND="
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
@@ -42,11 +40,9 @@ BDEPEND="
 "
 
 MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/va/va_backend_glx.h
 	/usr/include/va/va_x11.h
 	/usr/include/va/va_dri2.h
 	/usr/include/va/va_dricommon.h
-	/usr/include/va/va_glx.h
 )
 
 multilib_src_configure() {
@@ -54,7 +50,7 @@ multilib_src_configure() {
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
 		-Ddisable_drm=false
 		-Dwith_x11=$(usex X)
-		-Dwith_glx=$(usex X)
+		-Dwith_glx=no
 		-Dwith_wayland=$(usex wayland)
 		-Denable_docs=false
 	)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 15212d1da022..0f05bffde727 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,6 +1,8 @@
 AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6faa4f164a21a8e1b840a0d54c596049f29a7e94cbe6297343fa323dacebc1831ed6871d7e82ac12fe3026ab75823d07670c SHA512 8ea88344ebc345e4a996ebe39852e5d52806cba76ce433253c67f8840de6ce082515d2bec571d49bddfe3ec620912b3de0674c522c10203bbc590bd6df80fc55
 AUX opencollada-1.6.68-cmake-fixes.patch 4823 BLAKE2B 0a403bf25b0935380d86ee9fe272935dcff053b29813de665d4e65028115f7b0ae5d7c8e51a4de0d027c74a41d0ebc23883469a20ca2e150fb1c440976f4db25 SHA512 5c2499575d5127a94eab5876817019a9bf28a32843d6f610d5b39ca35de2463589a12cc58b0004947a6cfb369c0b4c8115584f32f827b11dd5b966bd0f171494
 AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70730707c3315ee8207a603fe2f6f1d569a37712572b69b011d75890837d530ddf788dfcd2f952dbeef9427a9167bf0b23d148a311512a6 SHA512 b18662b5844d71c643ad384fbdccd679b1177d6a9f0afcda653fd38d07a9d0048ab6abb029bc7b992198e455fcfbd868f8b74569606b3794d5a1892fddbf83be
+AUX opencollada-1.6.68-gcc13.patch 1263 BLAKE2B ecb12ae78a732d3e8a2d858d7a6ff1409e98f01dc23b94a376b9ceb3b76c076939054531a58781cfa378027f8bd5aa27c587185e66f80327a3d2d0e1981c85db SHA512 3b879549faf5261a30f141ea9a2b96701a4e02310156b602f47d507deadadc2db57e9f8ba20405d28f819d3886f9307d1e1736bc40b2cce62acd705dc86d63e8
+AUX opencollada-1.6.68-werror.patch 445 BLAKE2B 8b397bf950c8240e95214221f4fcfe0379fae3f31ce4cf3fb989f7c6b89f5432cf655202daf570cd3a692c0dd00b4efbeaa3b7c06de81ab034ad994727e9f798 SHA512 8fe614fe475a1a8b06cfcee2aaa1a666e1b4b42cfeaf5053cb23bbf056fafba6cf2cb13262cdd812f80bb8a4a63365f94e81aebeddc6c8d53f00c7f366f4776c
 DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173
-EBUILD opencollada-1.6.68.ebuild 1887 BLAKE2B c3a62d6fb6c53de47eb872b1bc2bef933c13c6880ac55d80706bafc0dc37c547ddde3f7d334f9913d4faf7a3fa9bdb57b02547924179755f6475af3b5f38902d SHA512 de0a56e8f3854b053543b0e91f846558dd0d32f4743b1b12b4a59b091c83a6bbaadf4c0a1903ffa857e8b10539c702bb8ebc3fddba7be9f80a79a84eed44a9e0
+EBUILD opencollada-1.6.68.ebuild 1968 BLAKE2B 4c7e06f75e153cca81f48efa37f3b4506299890f0ff004c293c28076711a1510237cfaecad986caf1ec85cf6e11f1f46502ee3ddae7a6277f33a1b760caaa21a SHA512 db237c5ebb556ac9f415e747b1ed445531da5f604ffe388b67e42da50a5c781de6c5533263db8f02f98dc86a3333c04741cb4a0d3266c5c6b617ccc33da656b2
 MISC metadata.xml 489 BLAKE2B b978448cfc058c6d9e723fef98d2f7d16974497bee81dfe3817cbf92cbbbacba6450ce32a931875d082760c4a2ae196b82214672dcd9c415f59dd97b20190a23 SHA512 91bd5a59106015bd88e11f99a2d68feac2b94f374c9344b068ad1563ae888fd6b0840a0d0c83fd8237c66892e311fb6ea8b0eb34302c30595667b4cf310d9cc2
diff --git a/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch b/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch
new file mode 100644
index 000000000000..e12771ca97a4
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/899750
+https://github.com/KhronosGroup/OpenCOLLADA/pull/656
+
+From 84c8c9a02b4e5fe40465034563cb36527e865dac Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Mon, 11 Jul 2022 21:33:11 +0100
+Subject: [PATCH] DAEValidator: fix gcc-13 build
+
+On gcc-13 c++ headers don't include <stdint.h> implicitly any more.
+This exposed build failure as:
+
+    /build/source/DAEValidator/library/src/XmlDoc.cpp: In member function 'virtual void opencollada::XmlDoc::readFile(const std::string&)':
+    /build/source/DAEValidator/library/src/XmlDoc.cpp:59:17: error: 'uint32_t' was not declared in this scope
+       59 |                 uint32_t signature = *reinterpret_cast<const uint32_t*>(content.data());
+          |                 ^~~~~~~~
+--- a/DAEValidator/library/src/DaeValidator.cpp
++++ b/DAEValidator/library/src/DaeValidator.cpp
+@@ -4,6 +4,7 @@
+ #include "Strings.h"
+ #include "StringUtil.h"
+ #include <cmath>
++#include <cstdint>
+ #include "no_warning_iomanip"
+ #include "no_warning_iostream"
+ #include <set>
+--- a/DAEValidator/library/src/XmlDoc.cpp
++++ b/DAEValidator/library/src/XmlDoc.cpp
+@@ -1,5 +1,6 @@
+ #include "Macros.h"
+ 
++#include <cstdint>
+ #if IS_GNUC_AND_GNUC_VERSION_LT(5,1,1)
+ #include <cstring>
+ #endif
+
diff --git a/media-libs/opencollada/files/opencollada-1.6.68-werror.patch b/media-libs/opencollada/files/opencollada-1.6.68-werror.patch
new file mode 100644
index 000000000000..3a490d326ddc
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.68-werror.patch
@@ -0,0 +1,11 @@
+--- a/DAEValidator/CMakeLists.txt
++++ b/DAEValidator/CMakeLists.txt
+@@ -100,7 +100,7 @@ if (WIN32)
+ # C4820: 'bytes' bytes padding added after construct 'member_name'
+ 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820")
+ else ()
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+ endif ()
+ 
+ add_custom_command(
diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index 49f53f567c18..d11bbc826b9f 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-null-conversion.patch"
 	"${FILESDIR}/${P}-cmake-fixes.patch"
 	"${FILESDIR}/${PN}-1.6.63-pcre-fix.patch"
+	"${FILESDIR}/${PN}-1.6.68-gcc13.patch"
+	"${FILESDIR}/${PN}-1.6.68-werror.patch"
 )
 
 src_prepare() {
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 49d10aaf8cb8..50dc1c8ec8e2 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -4,7 +4,6 @@ AUX xine-lib-1.2.13-configure-clang16.patch 4979 BLAKE2B 2b22560cb1aac2df82922d7
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
 DIST xine-lib-1.2.13.tar.xz 5007364 BLAKE2B 8c39328b4135035e7b4070c670591e61a92443bb389af3b7da053fd68101fcb2f18cd258840e96a5f3e02d4cf979b028947a10fddd1bfc3b92ed7f18d3f58942 SHA512 269275f0e324acc559695d268fb93e0e0ca4b17d22c4a57d482365ac058ae2aed125b9e1b522c1fc501cf4b2c186ac05d921d7c82a98e094cb0c70489e61c924
 EBUILD xine-lib-1.2.12-r4.ebuild 5489 BLAKE2B 21151c6f8f4d714a770b1add99a02e30ad258abbce0b34148dd81e1a193bdfb4f59addbbd01423dfe0c53935fd085a0246b79ffdf558cba128b1c3a5fcaeafa1 SHA512 bd34e9a9a9b894d3ff7529a53c4ed2e2adbc3190e9572ec02e7ef5048cbd5edf83bd4ed536cf88a33ccc993d6094e0965e38283dbe48e8724f99dc48eb9eba94
-EBUILD xine-lib-1.2.13-r1.ebuild 5540 BLAKE2B 9b0c4e455766f638b9860a0b09933221fa6a2ae26a9260ab605e9bc0c1b1ff8e9c446dbcf73b19bf107ff7c8a6982569b656652460cbece7f779771a81377a2f SHA512 3cf3609205fd26bb800dcc3672fe5bb3a1b2577704da0d6eb6a01aa53612ccef08a2bc73c1955cc439580b50ba5f65233ecbdb0241cc051653542ee9471dd0af
-EBUILD xine-lib-1.2.13.ebuild 5475 BLAKE2B 408ff7caff8917e90d242bbceac715ea15c843531096763e2328f3c169e66c025900701786ba1a75ac8b7dd50f68563e914e26b555b61276673611cc4255d839 SHA512 2b93784e11b4b89e25b98e5011df8cedacacb8fd784e1e58029b183292b8d2c242e3f3a570aab6b9fad75924aec08e62ebecc6c08f2f1c938b1de9216e6c3661
-EBUILD xine-lib-1.2.9999.ebuild 5475 BLAKE2B 408ff7caff8917e90d242bbceac715ea15c843531096763e2328f3c169e66c025900701786ba1a75ac8b7dd50f68563e914e26b555b61276673611cc4255d839 SHA512 2b93784e11b4b89e25b98e5011df8cedacacb8fd784e1e58029b183292b8d2c242e3f3a570aab6b9fad75924aec08e62ebecc6c08f2f1c938b1de9216e6c3661
+EBUILD xine-lib-1.2.13-r2.ebuild 5533 BLAKE2B 36357725cdab97ad7f6d3758aba058bc02144dbe6fe71c496b70cf6cb5ac01e90096bc0be652cd5878362b66616985e446eab397c2d1e61cf6aaf34c3a415df6 SHA512 3cb4d495229d9b8fb929fc4ea7bddd95c0306a056cab5f8d2b40d4ea33cdeb075241ad315051294d9143667d956c151b5bb8faa6d6d31c0ed0fd4a3663e6f2b7
+EBUILD xine-lib-1.2.9999.ebuild 5468 BLAKE2B f7bd1560c88d8334146bc06cc985587474ce202641bdf653525e261e559b29e86524089e71bc3f1c42187b1964f3f4f7ccca94b29582a080d6d62be13bd1552f SHA512 adf9b79ae4a361c50d81f36422c9dfaaec6a9f6d82e0746bd77c2af79b9d198b22f3d83903b4616f94b510bb6bc820328266be10aca2ff08f8378fcd4d33aab2
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.13-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
index ab82dbcb36f7..6ee408c8c782 100644
--- a/media-libs/xine-lib/xine-lib-1.2.13-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
@@ -81,7 +81,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[opengl,X] )
+	vaapi? ( media-libs/libva:=[X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
diff --git a/media-libs/xine-lib/xine-lib-1.2.13.ebuild b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
deleted file mode 100644
index a7cce97ce1ac..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.13.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib
-
-if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
-	inherit autotools mercurial
-	unset NLS_IUSE
-	NLS_DEPEND="sys-devel/gettext"
-	NLS_RDEPEND="virtual/libintl"
-else
-	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
-
-	NLS_IUSE="nls"
-	NLS_DEPEND="nls? ( sys-devel/gettext )"
-	NLS_RDEPEND="nls? ( virtual/libintl )"
-fi
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="https://xine.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
-REQUIRED_USE="
-	vidix? ( || ( X fbcon ) )
-	wayland? ( opengl )
-	xv? ( X )
-	xinerama? ( X )
-"
-
-RDEPEND="
-	dev-libs/libxdg-basedir
-	media-libs/libdvdnav
-	media-video/ffmpeg:=
-	sys-libs/zlib:=
-	virtual/libiconv
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	css? ( >=media-libs/libdvdcss-1.2.10 )
-	dav1d? ( media-libs/dav1d:= )
-	dts? ( media-libs/libdca )
-	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac:= )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( virtual/imagemagick-tools )
-	jack? ( virtual/jack )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	libcaca? ( media-libs/libcaca )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	nfs? ( net-fs/libnfs:= )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pulseaudio? ( media-libs/libpulse )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	sdl? ( media-libs/libsdl )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-	)
-	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[opengl,X] )
-	vcd? (
-		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:=[-minimal]
-	)
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	vpx? ( media-libs/libvpx:= )
-	wavpack? ( media-sound/wavpack )
-	wayland? ( dev-libs/wayland )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libxcb:=
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-DEPEND="
-	${RDEPEND}
-	oss? ( virtual/os-headers )
-	v4l? ( virtual/os-headers )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-	)
-	xv? ( x11-base/xorg-proto )
-	xvmc? ( x11-base/xorg-proto )
-	xinerama? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/libtool-2.2.6b
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
-
-	if [[ "${PV}" = *9999* ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	local x
-	for x in 0 1 2 3; do
-		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
-	done
-}
-
-src_configure() {
-	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
-
-	local win32dir #197236
-	if has_multilib_profile; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	local myconf=(
-		--disable-directfb
-		--disable-gnomevfs
-		--disable-optimizations
-		--disable-real-codecs
-		--disable-v4l
-		--disable-w32dll
-		--enable-avformat
-		--enable-ipv6
-		--with-external-dvdnav
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs
-		--with-w32-path=${win32dir}
-		--with-xv-path=/usr/$(get_libdir)
-		--without-esound
-		--without-fusionsound
-		# Added dav1d for now. Could support both? Does it need to be XOR?
-		--without-libaom
-		$(use_enable a52 a52dec)
-		$(use_enable aac faad)
-		$(use_enable aalib)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable bluray)
-		$(use_enable dts)
-		$(use_enable dvb)
-		$(use_enable dxr3)
-		$(use_enable fbcon fb)
-		$(use_enable gtk gdkpixbuf)
-		$(use_enable jpeg libjpeg)
-		$(use_enable mad)
-		$(use_enable mmap)
-		$(use_enable mng)
-		$(use_enable modplug)
-		$(use_enable musepack)
-		$(use_enable nfs)
-		$(use_enable opengl)
-		$(use_enable opengl glu)
-		$(use_enable oss)
-		$(use_enable samba)
-		$(use_enable sftp)
-		$(use_enable v4l libv4l)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi)
-		$(use_enable vdpau)
-		$(use_enable vis)
-		$(use_enable vidix)
-		$(use_enable xinerama)
-		$(use_enable xvmc)
-		$(use_enable vcd)
-		$(use_enable vdr)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with alsa)
-		$(use_with dav1d)
-		$(use_with flac libflac)
-		$(use_with imagemagick)
-		$(use_with jack)
-		$(use_with libcaca caca)
-		$(use_with pulseaudio)
-		$(use_with sdl)
-		$(use_with speex)
-		$(use_with theora)
-		$(use_with truetype fontconfig)
-		$(use_with truetype freetype)
-		$(use_with vorbis)
-		$(use_with wavpack)
-		$(use_with X x)
-		$(use_with X xcb)
-	)
-	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
-
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
-}
-
-src_compile() {
-	# enable verbose building, bug #448140
-	emake V=1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index a7cce97ce1ac..1c9b1e49151b 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -81,7 +81,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[opengl,X] )
+	vaapi? ( media-libs/libva:=[X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]