gentoo auto-resync : 07:01:2025 - 06:41:06

4 files changed, 145 insertions, 2 deletions

diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index f3ced323afb5..ea3f8695a005 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,7 +1,10 @@
+AUX gst-plugins-vaapi-1.24.10-wayland-optionality.patch 1454 BLAKE2B ebddd2e837aea5e03d15559575044084c9c60321d71a424e6c25546804c5f72c4aa29b809e5676fe28082a7cb4c8849815faf09f093d0082edae9e3d66f0ec03 SHA512 f0e292aa61370890a9487eb6b3e8138e967521f171428174dc67a2a7783fdce37480975e81c71119eee93e752764dbd54a026fb763b1b9680b364c6bcce62e68
 DIST gstreamer-vaapi-1.22.11.tar.xz 552468 BLAKE2B 0353699651add70639a4f7d591eccb646f5d6cda3ba8832553597b7b4e9bd3ebfe07d9eb1ac6e078219ee630131d502adccc8106a2207bb0234353905bafd8cd SHA512 939b748fea88c94ad59c1d4610a872a794b383382096a8f5f011a21d4c8fb041c28e1aa9a8d54f519fb3e48a69ed79622b0d45be01d2d5a900738a7928401563
 DIST gstreamer-vaapi-1.22.12.tar.xz 556192 BLAKE2B d8a1a0cb6616f001b1bc98febcb50c61e3af222f9461e8bb9b9d7cb43fd907f115eae76e1c069108fc98370432a82d4a754135a4e755f66d0a3107f205372793 SHA512 6253a97918cf8da5d063bfb9e3e8809c43610cc6495181319e7f198f43395637664ba867b210eaa72d74138dd9be4c39e3cd2d9e6d889ce4a06b0c2ad577f47a
 DIST gstreamer-vaapi-1.24.10.tar.xz 555624 BLAKE2B ffcbbc4d8096c622a3a89804f6b038fbd1ac75cd214f644ede09119b9ba7b5afa19788a9f6c66fad0537ae67c33e1b334cea75133100ad0daf1882a25601f54e SHA512 dad62a767eec9067afefdd7941df2eef31191cc597cd82fd42f196a36ee4dd3c94bd6852118cc8ba6318443dde0de16a77585daf93f61d683acfb034c167aa46
+DIST gstreamer-vaapi-1.24.11.tar.xz 547692 BLAKE2B 9373f9f56191ea8b9681a9638135eeff58c45669829aad6e5035003ac880048df1f5131699e6061586dc8869edc4e1506e9f3b27eb1428b4b20b9182e925be4d SHA512 dfe5ee78283d695103e9bac6bbece63705618f91122f7ab1e91edfce105d9848f2f552d0e83e05ed3d052a3151a4efe1db0955c48af6b3e40c903ffb335fd466
 EBUILD gst-plugins-vaapi-1.22.11-r1.ebuild 4184 BLAKE2B 44d1f0a062bee71c5e96122605340a21f6cc70abebdf1ef4645c49e072088db93607383ff735d37939447b75aaab0842187d2c8efd3e23d19aa4c51cba411ae2 SHA512 d6cf5fa0423a5dcc871e4b89d3e577c9d7db8897ab6b1fece1622a677d1a2e0ff020620f1e4b8cd39267316c31f141ec28dccd42970035410a8df4900ec7202b
 EBUILD gst-plugins-vaapi-1.22.12.ebuild 4184 BLAKE2B e814b99d7beb8b21c6f4ce9253848331047307ca37d85f885bdb3da358e5125edd3c2106f40b3d88127b3bbfe95d7109811a590033e8a8672bcf39aee25ddf99 SHA512 0e42277a16f9a4aef562b15a09ac76156323873b2c79e465348a8a470ebb4da97a743108dcc6ab892c1b981d111508b1a7ee48f40960e129fcacad7baa3139b3
-EBUILD gst-plugins-vaapi-1.24.10.ebuild 4188 BLAKE2B aedf07ff560385808d2fd253e8d0ef57de23a4fac8a53cfb628b80ecfe3b3b1858e3a8bacf3e0988415957c935ae789e1af2e3d8392c90448373dda17e3d04d2 SHA512 1a632e401e039d3f56cefcc3d3531a1004334ef7dc2528573cc76d3c1f20d1f0c70ae357ebd19f950617a77e44e7d04af4f94ff20eb2234b4373607a09e7a173
+EBUILD gst-plugins-vaapi-1.24.10-r2.ebuild 4256 BLAKE2B 19c916a6da1a6b95f5eab2ee813f41d83f53ea846d7fe815038d1aae3178d2cfd040c83d3e653ed5935f7d8432f1afb49ac1123ddaff4e924d95380efcb75bf0 SHA512 0fe3e519e77b75878e733a2a9c3fcc11636f9953a57aec9da7f379a0d94a5314dd4d5402fa1bb4e94a40f8dded058c1ea2a043fea47a6ecad4e568a0f15fb5ac
+EBUILD gst-plugins-vaapi-1.24.11.ebuild 4188 BLAKE2B 255d86b30680b596dbce7d4071be8f1ef21fb4ee1838e593e0ecddffabed91390657ea4030f4e903e13d9e10154b4b936735eb1adb56ddadd1fc6e526282343f SHA512 6419e56308a60eef15b721d4e4854687cc5fedf43c4952a89646d19ace295e8d41863474959fa32e8373e827a7fac4170c9c6e79f4e8f35e480cc9b89de0d7a6
 MISC metadata.xml 389 BLAKE2B 5bc087279f785f79761e488cbe11d0ecbdb3eba144a9f7312521ef98aed1f380acd1a0bdeeb041939dc3eeefe5df6b9ce95def5cad190f48ef600e1a2a9db661 SHA512 5ea6c64550ee823a3e74bf9dde214fb89967df663f32cde421e9d50f3cbc88f4de3598da976d3bebe57274f18c642c42b68705cc67af8268d022220371958a75
diff --git a/media-plugins/gst-plugins-vaapi/files/gst-plugins-vaapi-1.24.10-wayland-optionality.patch b/media-plugins/gst-plugins-vaapi/files/gst-plugins-vaapi-1.24.10-wayland-optionality.patch
new file mode 100644
index 000000000000..46356da8a8cd
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/files/gst-plugins-vaapi-1.24.10-wayland-optionality.patch
@@ -0,0 +1,35 @@
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/577df3a02f7f26283b2749c58ae7738bbdf4be4c
+
+From 577df3a02f7f26283b2749c58ae7738bbdf4be4c Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Fri, 13 Sep 2024 14:37:10 +0530
+Subject: [PATCH] meson: Re-added required: lines accidentally removed
+
+Broke in e3f086c648171c3c993f5dd73e2d025480c3729e
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3801
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7512>
+---
+ meson.build | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 5b4a0bbbd71a..e0f8cd19ff51 100644
+--- a/meson.build
++++ b/meson.build
+@@ -80,9 +80,9 @@ else
+ endif
+ 
+ libva_dep = dependency('libva', version: libva_req)
+-libva_drm_dep = dependency('libva-drm', version: libva_req)
+-libva_wayland_dep = dependency('libva-wayland', version: libva_req)
+-libva_x11_dep = dependency('libva-x11', version: libva_req)
++libva_drm_dep = dependency('libva-drm', required: get_option('drm'), version: libva_req)
++libva_wayland_dep = dependency('libva-wayland', required: get_option('wayland'), version: libva_req)
++libva_x11_dep = dependency('libva-x11', required: get_option('x11'), version: libva_req)
+ 
+ libdrm_dep = dependency('libdrm', version: libdrm_req, required: get_option('drm'))
+ libudev_dep = dependency('libudev', required: get_option('drm'))
+-- 
+GitLab
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r2.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r2.ebuild
new file mode 100644
index 000000000000..38d0dfb4f97e
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gstreamer-meson
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
+HOMEPAGE="https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+drm +egl +gles2 opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
+
+# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
+# we design gst-vaapi ebuild in terms of GL API as main choice as well, meaning that USE opengl and/or gles2 is required to
+# enable opengl support at all and choices get chained from there.
+# One or multiple video output are required: drm, x11, glx, egl and/or wayland;
+# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled;
+# So "|| ( drm egl opengl wayland X )" would be wrong, because egl isn't built with USE="egl -opengl -gles2", ending up with no video outputs.
+# As we ensure at least one working GL output with other REQUIRED_USE, we can put gles2/opengl in REQUIRED_USE instead of egl, solving the issue.
+# gles2 API only supported windowing system (on linux) is EGL, so require it
+# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X")
+REQUIRED_USE="
+	|| ( drm gles2 opengl wayland X )
+	gles2? ( egl )
+	opengl? ( || ( egl X ) )
+	wayland? ( drm )
+"
+
+# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c
+# USE flag behavior:
+# 'drm' enables vaapi drm support
+# 'egl' enables EGL platform support (but only if also 'opengl||gles2')
+# - 'egl' is exposed as a USE flag mainly to get EGL support instead of or in addition to GLX support with desktop GL while keeping it optional for pure GLX cases;
+#   it's always required with USE=gles2, thus USE="gles2 opengl X" will require and build desktop GL EGL platform support as well on top of GLX, which doesn't add extra deps at that point.
+# 'gles2' enables GLESv2 or GLESv3 based GL API support
+# 'opengl' enables desktop OpenGL based GL API support
+# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2')
+# 'X' enables non-GL X support; GLX support when combined with 'opengl'
+# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16)
+GST_REQ="${PV}"
+GL_DEPS="
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
+	|| (
+		>=media-libs/mesa-24.1.0_rc1[opengl,X?,${MULTILIB_USEDEP}]
+		<media-libs/mesa-24.1.0_rc1[gles2?,egl(+)?,X?,${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/libva-1.15.0:=[drm(+)?,wayland?,X?,${MULTILIB_USEDEP}]
+	drm? (
+		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.98[${MULTILIB_USEDEP}]
+	)
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+	wayland? ( >=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# FIXME: "Failed to create vaapipostproc element"
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.24.10-wayland-optionality.patch
+)
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="wayland"
+
+	local emesonargs=(
+		-Dencoders=enabled
+		$(meson_feature drm)
+		$(meson_feature X x11)
+		$(meson_feature wayland)
+	)
+
+	if use opengl || use gles2; then
+		emesonargs+=( $(meson_feature egl) )
+	else
+		emesonargs+=( -Degl=disabled )
+	fi
+
+	if use opengl && use X; then
+		emesonargs+=( -Dglx=enabled )
+	else
+		emesonargs+=( -Dglx=disabled )
+	fi
+
+	# Workaround EGL/eglplatform.h being built with X11 present
+	use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.11.ebuild
index 79e497f679ec..a86ccebc4c27 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.11.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