[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-vaapi/, media-plugins/gst-plugins-vaapi/files/

["Sam James" <sam@gentoo.org>]

commit:     fb790a9243a0085e5590016b36fc6c2701af3b94
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 09:17:00 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 09:17:29 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb790a92

media-plugins/gst-plugins-vaapi: backport patch to fix wayland optionality

Closes: https://bugs.gentoo.org/947518
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...plugins-vaapi-1.24.10-wayland-optionality.patch | 35 ++++++++++++++++++++++
 ....ebuild => gst-plugins-vaapi-1.24.10-r2.ebuild} |  6 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)

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-r1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r2.ebuild
similarity index 96%
rename from media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r1.ebuild
rename to media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r2.ebuild
index 7a496c350f7a..38d0dfb4f97e 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r1.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r2.ebuild
@@ -52,7 +52,7 @@ GL_DEPS="
 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}]
+	>=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}]
@@ -72,6 +72,10 @@ 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"