gentoo auto-resync : 05:01:2025 - 06:31:57edge

3 files changed, 106 insertions, 3 deletions

diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 294f64f7c182..f3ced323afb5 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD gst-plugins-vaapi-1.22.11-r1.ebuild 4184 BLAKE2B 44d1f0a062bee71c5e96122605340a21f6cc70abebdf1ef4645c49e072088db93607383ff735d37939447b75aaab0842187d2c8efd3e23d19aa4c51cba411ae2 SHA512 d6cf5fa0423a5dcc871e4b89d3e577c9d7db8897ab6b1fece1622a677d1a2e0ff020620f1e4b8cd39267316c31f141ec28dccd42970035410a8df4900ec7202b
-EBUILD gst-plugins-vaapi-1.22.12.ebuild 4188 BLAKE2B 868f5ecada0ded98f622753bf5e74ccb7b086af82d7742c377f22965bd3e7377eeae59fe899776eb2d1bea48b7db6e27fe05ab547cce7812bc5f9ee525d4c7e6 SHA512 4a8ad627004c276c619c54dfd1b1a7cb089aa48f49b4c1825ad349f71b6b562ac8078dead371c25a878c168d7d963c94445a2b50cdb2fc1a475e9c3e87e2e1cd
+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
 MISC metadata.xml 389 BLAKE2B 5bc087279f785f79761e488cbe11d0ecbdb3eba144a9f7312521ef98aed1f380acd1a0bdeeb041939dc3eeefe5df6b9ce95def5cad190f48ef600e1a2a9db661 SHA512 5ea6c64550ee823a3e74bf9dde214fb89967df663f32cde421e9d50f3cbc88f4de3598da976d3bebe57274f18c642c42b68705cc67af8268d022220371958a75
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.12.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.12.ebuild
index 0b2bbaa48bca..5b3fcb6f14bc 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.12.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
@@ -11,7 +11,7 @@ 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"
+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,
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.10.ebuild
new file mode 100644
index 000000000000..79e497f679ec
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 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"
+
+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
+}