* [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-vaapi/, media-plugins/gst-plugins-vaapi/files/
@ 2018-06-16 18:27 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2018-06-16 18:27 UTC (permalink / raw
To: gentoo-commits
commit: ad232d5ad5f11e64951cdcd6438c5319466f0d4e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 18:07:20 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 18:27:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad232d5a
media-plugins/gst-plugins-vaapi: bump to 1.14.1, rework OpenGL handling
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-plugins/gst-plugins-vaapi/Manifest | 1 +
.../gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch | 33 ++++++
.../gst-plugins-vaapi-1.14.1.ebuild | 112 +++++++++++++++++++++
media-plugins/gst-plugins-vaapi/metadata.xml | 1 +
4 files changed, 147 insertions(+)
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 7108b9ee314..64a3c974198 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,2 +1,3 @@
DIST gstreamer-vaapi-1.12.3.tar.xz 996360 BLAKE2B d34804f278780e073b553542258f865a93e62d48b0cd276fa7fa47e54f03a5484d7ddc61851f75e583dbcc03d6dbfce6a9c8df0e4c1c6174dfaefdcf867ca068 SHA512 c70da985b1c0c5048be8d83ba62622b9064d78193433b897d54824125de3eeabe4f9765ec0a5199a2d9eaa91d0625dfa2b7ef3d8245b23cf57361691d72b1dc4
DIST gstreamer-vaapi-1.12.4.tar.xz 998844 BLAKE2B e37d6f66054e46e421ffbd4c27362bba0fb2ad57bfccb4891ba85573dec18ca304654336768a519c202bda0e829b80ab75a5708ddfc1dc9751774b4ef783a16d SHA512 2251395f77be8d17837f4b0d38a2271155a5fbd57560fac9334660abb34a4f609dda8d9714bfa8f64395a85d3fa336f7ad1b8e8e7490b5288843fbe3d1dbd7f5
+DIST gstreamer-vaapi-1.14.1.tar.xz 1064992 BLAKE2B bae42e3cafc6d1e5799a8ef795f9e1f6a6ac60b6878aea1aed81550fd7e408c5104b5ea89d6e5f7535ac8d21fe5f14fccf061e15eb68a7c1c60c29ad4a4deabb SHA512 f1eecb61cb92439d93a47ac162a5cda8a456dbb205594f378e8adf98c45e4cd59553ccfd3bbcf1c6a568c6af5e7834bbfb0ea17610f0c7e7c9e268a4eeb5b020
diff --git a/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch b/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch
new file mode 100644
index 00000000000..d0a34b5bd0c
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch
@@ -0,0 +1,33 @@
+From 45fb111850955d9192e43b9dbcb2ef8e3974e58d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
+ <vjaquez@igalia.com>
+Date: Mon, 21 May 2018 13:27:14 +0200
+Subject: plugins: guard GstGL code
+
+---
+ gst/vaapi/gstvaapipluginutil.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c
+index fa25131..648c91b 100644
+--- a/gst/vaapi/gstvaapipluginutil.c
++++ b/gst/vaapi/gstvaapipluginutil.c
+@@ -246,6 +246,7 @@ gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object)
+ static void
+ gst_vaapi_find_gl_context (GstElement * element)
+ {
++#if USE_GST_GL_HELPERS
+ GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element);
+
+ /* if the element is vaapisink or any vaapi encoder it doesn't need
+@@ -282,6 +283,7 @@ no_valid_gl_display:
+ gst_object_replace (&plugin->gl_other_context, NULL);
+ return;
+ }
++#endif
+ }
+
+ gboolean
+--
+cgit v1.1
+
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild
new file mode 100644
index 00000000000..46ecb750160
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune multilib-minimal
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
+HOMEPAGE="https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1" # TODO: Check for "or later"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm64 ~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 ) )
+"
+
+# 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="1.14.1"
+GL_DEPS="
+ >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
+ media-libs/mesa[gles2?,egl?,${MULTILIB_USEDEP}]
+"
+RDEPEND="
+ >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+ >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}]
+ drm? (
+ >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+ )
+ gles2? ( ${GL_DEPS} )
+ opengl? ( ${GL_DEPS} )
+ wayland? ( >=dev-libs/wayland-1.0.6[${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}
+ >=dev-util/gtk-doc-am-1.12
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PV}-fix_no_GL.patch )
+
+multilib_src_configure() {
+ local myconf=()
+ if use opengl || use gles2; then
+ myconf+=(
+ $(use_enable egl)
+ --with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed
+ )
+ else
+ myconf+=(
+ --disable-egl
+ --without-glapi
+ )
+ fi
+
+ if use opengl && use X; then
+ myconf+=( --enable-glx )
+ else
+ myconf+=( --disable-glx )
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static \
+ --disable-debug \
+ --disable-examples \
+ --enable-encoders \
+ $(use_enable drm) \
+ $(use_enable X x11) \
+ $(use_enable wayland) \
+ --without-gtk \
+ "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/media-plugins/gst-plugins-vaapi/metadata.xml b/media-plugins/gst-plugins-vaapi/metadata.xml
index be2c01c8413..73b9785ae4d 100644
--- a/media-plugins/gst-plugins-vaapi/metadata.xml
+++ b/media-plugins/gst-plugins-vaapi/metadata.xml
@@ -8,5 +8,6 @@
<use>
<flag name="drm">Enable DRM renderer</flag>
<flag name="egl">Enable EGL support</flag>
+ <flag name="gles2">Enable GLESv2 and GLESv3 support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-vaapi/, media-plugins/gst-plugins-vaapi/files/
@ 2020-01-01 15:08 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-01-01 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 0deea97be4f5038f9da47d705c7299476e705012
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 15:06:45 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 15:08:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0deea97b
media-plugins/gst-plugins-vaapi: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-plugins/gst-plugins-vaapi/Manifest | 2 -
.../gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch | 33 ------
.../gst-plugins-vaapi-1.14.1.ebuild | 112 ---------------------
.../gst-plugins-vaapi-1.14.3.ebuild | 110 --------------------
4 files changed, 257 deletions(-)
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index c0b345dffbb..7b5b00fb693 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,3 +1 @@
-DIST gstreamer-vaapi-1.14.1.tar.xz 1064992 BLAKE2B bae42e3cafc6d1e5799a8ef795f9e1f6a6ac60b6878aea1aed81550fd7e408c5104b5ea89d6e5f7535ac8d21fe5f14fccf061e15eb68a7c1c60c29ad4a4deabb SHA512 f1eecb61cb92439d93a47ac162a5cda8a456dbb205594f378e8adf98c45e4cd59553ccfd3bbcf1c6a568c6af5e7834bbfb0ea17610f0c7e7c9e268a4eeb5b020
-DIST gstreamer-vaapi-1.14.3.tar.xz 1070536 BLAKE2B 7e3458702072d96acc31c1ac5c4ec9f23f6d618ba922884fb141a0897a04959da7f34c7abff7765f086357d3f8f7532a1582508d117c199f76338ebd3723c6ae SHA512 b89acf63c2900b0cd588cce1a06d959a4f8bbe929c237fce985d3cfce7b94d43a3317f06a42fa77e3ff790fff8a81c8bbeeed7ac797794e4cc3342f18faa69e3
DIST gstreamer-vaapi-1.14.5.tar.xz 1068344 BLAKE2B b98363981dc7f111fc8c15188d31dea394b7f6cf300050b95d564b75020931a0f8690d11410f2d3d18d6649ef2ee290c933c3731b4bc3ca43bffb57a4c1bf542 SHA512 287df56ad9bb3fd0754b9f307082eb180c8f0b622e2c9436c5dcf2272a5fb620cb18970726d231688837d52cb169a10e98e14160e51fd82198c34ea612c0d60b
diff --git a/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch b/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch
deleted file mode 100644
index d0a34b5bd0c..00000000000
--- a/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 45fb111850955d9192e43b9dbcb2ef8e3974e58d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
- <vjaquez@igalia.com>
-Date: Mon, 21 May 2018 13:27:14 +0200
-Subject: plugins: guard GstGL code
-
----
- gst/vaapi/gstvaapipluginutil.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c
-index fa25131..648c91b 100644
---- a/gst/vaapi/gstvaapipluginutil.c
-+++ b/gst/vaapi/gstvaapipluginutil.c
-@@ -246,6 +246,7 @@ gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object)
- static void
- gst_vaapi_find_gl_context (GstElement * element)
- {
-+#if USE_GST_GL_HELPERS
- GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element);
-
- /* if the element is vaapisink or any vaapi encoder it doesn't need
-@@ -282,6 +283,7 @@ no_valid_gl_display:
- gst_object_replace (&plugin->gl_other_context, NULL);
- return;
- }
-+#endif
- }
-
- gboolean
---
-cgit v1.1
-
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild
deleted file mode 100644
index c3c7c035b24..00000000000
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune multilib-minimal
-
-MY_PN="gstreamer-vaapi"
-DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
-HOMEPAGE="https://cgit.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 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 ) )
-"
-
-# 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="1.14.1"
-GL_DEPS="
- >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
- media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
-"
-RDEPEND="
- >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
- >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}]
- drm? (
- >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
- >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
- )
- gles2? ( ${GL_DEPS} )
- opengl? ( ${GL_DEPS} )
- wayland? ( >=dev-libs/wayland-1.0.6[${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}
- >=dev-util/gtk-doc-am-1.12
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PV}-fix_no_GL.patch )
-
-multilib_src_configure() {
- local myconf=()
- if use opengl || use gles2; then
- myconf+=(
- $(use_enable egl)
- --with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed
- )
- else
- myconf+=(
- --disable-egl
- --without-glapi
- )
- fi
-
- if use opengl && use X; then
- myconf+=( --enable-glx )
- else
- myconf+=( --disable-glx )
- fi
-
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-debug \
- --disable-examples \
- --enable-encoders \
- $(use_enable drm) \
- $(use_enable X x11) \
- $(use_enable wayland) \
- --without-gtk \
- "${myconf[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
deleted file mode 100644
index 79f8f43c479..00000000000
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-MY_PN="gstreamer-vaapi"
-DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
-HOMEPAGE="https://cgit.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 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 ) )
-"
-
-# 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[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
-"
-RDEPEND="
- >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
- >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}]
- drm? (
- >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
- >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
- )
- gles2? ( ${GL_DEPS} )
- opengl? ( ${GL_DEPS} )
- wayland? ( >=dev-libs/wayland-1.0.6[${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}
- >=dev-util/gtk-doc-am-1.12
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-multilib_src_configure() {
- local myconf=()
- if use opengl || use gles2; then
- myconf+=(
- $(use_enable egl)
- --with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed
- )
- else
- myconf+=(
- --disable-egl
- --without-glapi
- )
- fi
-
- if use opengl && use X; then
- myconf+=( --enable-glx )
- else
- myconf+=( --disable-glx )
- fi
-
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-debug \
- --disable-examples \
- --enable-encoders \
- $(use_enable drm) \
- $(use_enable X x11) \
- $(use_enable wayland) \
- --without-gtk \
- "${myconf[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-vaapi/, media-plugins/gst-plugins-vaapi/files/
@ 2021-11-22 17:37 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2021-11-22 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 71597a2506a6df852cde9b4c693c88972b5065e4
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 17:35:59 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 17:35:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71597a25
media-plugins/gst-plugins-vaapi: avoid calling python3
Closes: https://bugs.gentoo.org/823701
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
...calling-python3-script-to-enable-git-hook.patch | 26 ++++++++++++++++++++++
.../gst-plugins-vaapi-1.18.4-r2.ebuild | 4 ++++
2 files changed, 30 insertions(+)
diff --git a/media-plugins/gst-plugins-vaapi/files/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch b/media-plugins/gst-plugins-vaapi/files/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch
new file mode 100644
index 000000000000..4a1d19fa487a
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/files/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch
@@ -0,0 +1,26 @@
+From a417420d30ed258143259de4706795e0515ad795 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 22 Nov 2021 12:31:57 -0500
+Subject: [PATCH] Avoid calling python3 script to enable git hook
+
+This has not been submitted upstream: the gstreamer-vaapi repo appears
+to be merging into the gstreamer "mono" repo, where this issue does not
+exist.
+---
+ meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 60e26e0f..05aefff7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -207,6 +207,3 @@ if gst_version_nano == 0
+ endif
+
+ configure_file(output: 'config.h', configuration: cdata)
+-
+-python3 = import('python').find_installation()
+-run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')
+--
+2.34.0
+
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild
index c1c1a02a825d..4fca3ec4362a 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild
@@ -72,6 +72,10 @@ S="${WORKDIR}/${MY_PN}-${PV}"
# FIXME: "Failed to create vaapipostproc element"
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch"
+)
+
multilib_src_configure() {
local emesonargs=(
-Dwith_encoders=yes
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-vaapi/, media-plugins/gst-plugins-vaapi/files/
@ 2025-01-06 9:18 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-01-06 9:18 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-06 9:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-01 15:08 [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-vaapi/, media-plugins/gst-plugins-vaapi/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 9:18 Sam James
2021-11-22 17:37 Mike Gilbert
2018-06-16 18:27 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox