gentoo auto-resync : 11:04:2025 - 08:43:58

4 files changed, 88 insertions, 5 deletions

diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index 878714f19147..85653ecc072a 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,4 +1,5 @@
 DIST libva-2.22.0.tar.gz 301705 BLAKE2B b438c95613628b8eb1150238016bafdf2ef33fc01ed78742cd50768238cedf5475752a6dd7413ee217961a705abcd7628219ddf3f13c5aa77015b6bbb4e77929 SHA512 cd633e5e09eac1ed10f1fc12b0f664f836e0eda9e47c17e1295b746cfd643a18fd0564a06a148ced3cf1e2321aa4d21275918bcf8c717d3981e98a598179f370
+EBUILD libva-2.22.0-r1.ebuild 1748 BLAKE2B c81774144729e3efa12687431b2164492f049691de2f140556ed16f6fa7913195a10b08e4028bcb8bda9a5791d0d2eb212d20fa48d9bb0bfc52d7d7b5dbcdd8e SHA512 cd267e259118b74042a4dd55c214c641c368cb434e6ed51440839f81fdc0b522558569914db533ed07f3f130ad0a56506f06118731f56115a7011626bb2181fe
 EBUILD libva-2.22.0.ebuild 1577 BLAKE2B 1730caf550103f827e0c08225d692249fa4b75cd0cef49208b5aa3fe045109525ef56f38b0ead5f430ef77c96db1140da5314176c271532f53c6fab6fffe2310 SHA512 df534a65df7fda86c2f12406cd8d8096067553021e2b7157d9003d0b791c35402ea0c4322ce4d230bec0cd3e2a9e45658bd1ad56df6138d0ea61d354cbd81fdd
-EBUILD libva-9999.ebuild 1544 BLAKE2B 9a11667941f748b7de6ee372496a659d71d32f409b98e8a77e922fbff6b2a1852828c9f2674e45a2570783d42a4e92a04ad26949afde51fc3ecabe4a2d0deee9 SHA512 4463670469882e5e3e56c0f92bbb7c375ee6bf0e7ead0306f717b0e8f96ac21d5e1ba8b0922df18909fb5002224b4dfba32981b6a48aa926b45dfc64b82b53a0
-MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
+EBUILD libva-9999.ebuild 1712 BLAKE2B 9c9e71fb62a9f0cb99d7df470b8484566c439800148d9cde70ce56845b7813268f576814eb81762a08cb193e8d40bf2d698fc15f802ef790a3bd140d64e12102 SHA512 6798cca8d92cf93353891e8b8aa50434a65a71bf46a35e438b7e3e24ddd2acbdb941782859588255eacbdacb27dbb22b7d2e0cfa97f42c99b9893d284fdaf290
+MISC metadata.xml 472 BLAKE2B 2b368f70221663474237dd1aebcc1529cb663efb26e6ae0fced581052660ee0b28166dd68685dc29f3f3ade3abb602f3861bcfa8cd3eb1bf2259ffc6d913595f SHA512 75479658282d6e0aaf497a42e81507bd0a78c69b90128cb469d04adc0814b87ca613893ad4871b4e8a7974935bf36ea08a9a3e136ad3affa177b874b078892f1
diff --git a/media-libs/libva/libva-2.22.0-r1.ebuild b/media-libs/libva/libva-2.22.0-r1.ebuild
new file mode 100644
index 000000000000..5fa18768df19
--- /dev/null
+++ b/media-libs/libva/libva-2.22.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib optfeature
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://github.com/intel/libva"
+
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+else
+	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="glx wayland X"
+REQUIRED_USE="glx? ( X )"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.75[${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+	)
+	X? (
+		glx? (
+			media-libs/libglvnd[X?,${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}]
+		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	wayland? ( dev-util/wayland-scanner )
+	virtual/pkgconfig
+"
+
+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() {
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=$(usex X $(usex glx))
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature_header
+	optfeature "Older Intel GPU support up to Gen8" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support from Gen9+" media-libs/libva-intel-media-driver
+}
diff --git a/media-libs/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild
index bfc76885c3de..6d2c5c7172e0 100644
--- a/media-libs/libva/libva-9999.ebuild
+++ b/media-libs/libva/libva-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,8 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="wayland X"
+IUSE="glx wayland X"
+REQUIRED_USE="glx? ( X )"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.75[${MULTILIB_USEDEP}]
@@ -27,6 +28,9 @@ RDEPEND="
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)
 	X? (
+		glx? (
+			media-libs/libglvnd[X?,${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}]
@@ -40,9 +44,11 @@ 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() {
@@ -50,7 +56,7 @@ multilib_src_configure() {
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
 		-Ddisable_drm=false
 		-Dwith_x11=$(usex X)
-		-Dwith_glx=no
+		-Dwith_glx=$(usex X $(usex glx))
 		-Dwith_wayland=$(usex wayland)
 		-Denable_docs=false
 	)
diff --git a/media-libs/libva/metadata.xml b/media-libs/libva/metadata.xml
index 503fb56bd40a..1ba0d2f37793 100644
--- a/media-libs/libva/metadata.xml
+++ b/media-libs/libva/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
   <remote-id type="github">intel/libva</remote-id>
   </upstream>
+  <use>
+    <flag name="glx">Enable GLX backend (requires X). Provides libva-glx.so, needed only by some prebuilt binaries.</flag>
+  </use>
 </pkgmetadata>