From 824ce0e87ee4eff6cb4ebfb2a45e3fcaf784b9cd Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 10 Jun 2023 15:22:42 +0100 Subject: media-libs/gst-plugins-bad: fix va Thanks to kostadin for reporting. Add in a bunch of stashed changes (like commenting out RESTRICT="test" again for now as I need to recheck that). Bug: https://bugs.gentoo.org/907479 Fixes: d8fdc47378f4d53b5c1ebcc0f821d5b9f1e4753e Signed-off-by: Sam James --- .../gst-plugins-bad-1.22.3-r2.ebuild | 102 -------------------- .../gst-plugins-bad-1.22.3-r3.ebuild | 106 +++++++++++++++++++++ 2 files changed, 106 insertions(+), 102 deletions(-) delete mode 100644 media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r2.ebuild create mode 100644 media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r3.ebuild (limited to 'media-libs/gst-plugins-bad') diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r2.ebuild deleted file mode 100644 index b4aa92c77119..000000000000 --- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GST_ORG_MODULE="gst-plugins-bad" -PYTHON_COMPAT=( python3_{10..11} ) -inherit gstreamer-meson python-any-r1 - -DESCRIPTION="Less plugins for GStreamer" -HOMEPAGE="https://gstreamer.freedesktop.org/" - -LICENSE="LGPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - -# TODO: egl and gtk IUSE only for transition -IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vaapi vnc wayland qsv" # Keep default IUSE mirrored with gst-plugins-base where relevant - -# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin -# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here) -# FIXME gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] ) -RDEPEND=" - !media-plugins/gst-plugins-va - !media-plugins/gst-transcoder - - >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] - >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=] - introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) - - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) ) - wayland? ( - >=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}] - >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.15 - ) - - orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] ) - - qsv? ( media-libs/oneVPL[wayland?,X?,${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/glib-utils -" - -DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE ) - -# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL) -#RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch - "${FILESDIR}"/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch -) - -src_prepare() { - default - addpredict /dev # Prevent sandbox violations bug #570624 -} - -multilib_src_configure() { - GST_PLUGINS_NOAUTO="shm ipcpipeline librfb msdk hls" - - local emesonargs=( - -Dshm=enabled - -Dipcpipeline=enabled - -Dhls=disabled - $(meson_feature vaapi va) - $(meson_feature vnc librfb) - $(meson_feature wayland) - ) - - if use qsv; then - emesonargs+=( - -Dmsdk=enabled - -Dmfx_api=oneVPL - ) - else - emesonargs+=( -Dmsdk=disabled ) - fi - - if use opengl || use gles2; then - myconf+=( -Dgl=enabled ) - else - myconf+=( -Dgl=disabled ) - fi - - gstreamer_multilib_src_configure -} - -multilib_src_test() { - # Tests are slower than upstream expects - CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r3.ebuild new file mode 100644 index 000000000000..b3bfad99e2f5 --- /dev/null +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r3.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GST_ORG_MODULE="gst-plugins-bad" +PYTHON_COMPAT=( python3_{10..11} ) +inherit gstreamer-meson python-any-r1 + +DESCRIPTION="Less plugins for GStreamer" +HOMEPAGE="https://gstreamer.freedesktop.org/" + +LICENSE="LGPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + +# TODO: egl and gtk IUSE only for transition +IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vaapi vnc wayland qsv" # Keep default IUSE mirrored with gst-plugins-base where relevant + +# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin +# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here) +# FIXME gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] ) +# Baseline requirement for libva is 1.6, but 1.10 gets more features +RDEPEND=" + !media-plugins/gst-plugins-va + !media-plugins/gst-transcoder + + >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] + >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=] + introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) + + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) ) + wayland? ( + >=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}] + >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.15 + ) + + orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] ) + + qsv? ( media-libs/oneVPL[wayland?,X?,${MULTILIB_USEDEP}] ) + + vaapi? ( >=media-libs/libva-1.10[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + ${PYTHON_DEPS} + dev-util/glib-utils +" + +DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE ) + +# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL) +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch + "${FILESDIR}"/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch +) + +src_prepare() { + default + addpredict /dev # Prevent sandbox violations bug #570624 +} + +multilib_src_configure() { + GST_PLUGINS_NOAUTO="shm ipcpipeline librfb msdk hls" + + local emesonargs=( + -Dshm=enabled + -Dipcpipeline=enabled + -Dhls=disabled + $(meson_feature vnc librfb) + $(meson_feature wayland) + ) + + if use qsv; then + emesonargs+=( + -Dmsdk=enabled + -Dmfx_api=oneVPL + ) + else + emesonargs+=( -Dmsdk=disabled ) + fi + + # XXX: See comment above IUSE wrt egl; this was actually typo'd with + # myconf for ages and nothing exploded. + #if use opengl || use gles2; then + # emesonargs+=( -Dgl=enabled ) + #else + # emesonargs+=( -Dgl=disabled ) + #fi + + gstreamer_multilib_src_configure "$(meson_feature vaapi va)" +} + +multilib_src_test() { + # Tests are slower than upstream expects + CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3-65-gdbad