diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest index df086fb7aacd6..d821ac4d455d7 100644 --- a/media-libs/gst-plugins-bad/Manifest +++ b/media-libs/gst-plugins-bad/Manifest @@ -1,4 +1,2 @@ -DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70 -DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189 DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066 diff --git a/media-libs/gst-plugins-bad/files/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch b/media-libs/gst-plugins-bad/files/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch deleted file mode 100644 index ef944db920c25..0000000000000 --- a/media-libs/gst-plugins-bad/files/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch +++ /dev/null @@ -1,65 +0,0 @@ -https://bugs.gentoo.org/907479 -https://bugs.gentoo.org/907481 -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/55ee0635d3f63c408067dd904f8e8b718983ba0e -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/479f0175b51ea74b07084c8a508b7a7224445a02 -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428 - -From 864a329f7946460f9bb9dac171d0d80b2ff09a07 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan -Date: Fri, 14 Apr 2023 13:18:52 +0530 -Subject: [PATCH 1/2] meson: Fix libdrm and vaapi configure checks - -We do not need fallback: for libdrm checks because the wrap file -already has a [provide] section. - -Part-of: ---- a/gst-libs/gst/va/meson.build -+++ b/gst-libs/gst/va/meson.build -@@ -31,17 +31,26 @@ if host_system != 'linux' - subdir_done() - endif - -+va_opt = get_option('va') -+msdk_opt = get_option('msdk') -+qsv_opt = get_option('qsv') -+if va_opt.disabled() and msdk_opt.disabled() and qsv_opt.disabled() -+ subdir_done() -+endif -+ -+va_required = va_opt.enabled() or msdk_opt.enabled() or qsv_opt.enabled() -+ - libva_req = ['>= 1.6'] --libva_dep = dependency('libva', version: libva_req, required: false, -+libva_dep = dependency('libva', version: libva_req, required: va_required, - fallback: ['libva', 'libva_dep']) --libva_drm_dep = dependency('libva-drm', version: libva_req, required: false, -+libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_required, - fallback: ['libva', 'libva_drm_dep']) - - if not (libva_dep.found() and libva_drm_dep.found()) - subdir_done() - endif - --libdrm_dep = dependency('libdrm', required: false, fallback: ['libdrm', 'ext_libdrm']) -+libdrm_dep = dependency('libdrm', version: '>=2.4', required: false) - cdata.set10('HAVE_LIBDRM', libdrm_dep.found()) - - va_enums = gnome.mkenums_simple('va-enumtypes', ---- a/sys/kms/meson.build -+++ b/sys/kms/meson.build -@@ -11,11 +11,9 @@ if host_system != 'linux' - endif - - libdrm_dep = dependency('libdrm', version : '>= 2.4.98', -- required : get_option('kms'), -- fallback: ['libdrm', 'ext_libdrm']) -+ required : get_option('kms')) - libdrm_hdr_dep = dependency('libdrm', version : '>= 2.4.104', -- required : false, -- fallback: ['libdrm', 'ext_libdrm']) -+ required : false) - mathlib = cc.find_library('m', required : false) - - if libdrm_hdr_dep.found() and mathlib.found() --- -2.40.1 diff --git a/media-libs/gst-plugins-bad/files/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch b/media-libs/gst-plugins-bad/files/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch deleted file mode 100644 index 55ea57fa81288..0000000000000 --- a/media-libs/gst-plugins-bad/files/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://bugs.gentoo.org/907479 -https://bugs.gentoo.org/907481 -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/55ee0635d3f63c408067dd904f8e8b718983ba0e -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/479f0175b51ea74b07084c8a508b7a7224445a02 -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428 - -From ffecb5f1a02174c2d6ab6ca472c6c0cab10179b3 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan -Date: Fri, 14 Apr 2023 16:11:55 +0530 -Subject: [PATCH 2/2] meson: Add feature options for optional va deps libdrm - and gudev - -Part-of: -Signed-off-by: Sam James ---- a/gst-libs/gst/va/meson.build -+++ b/gst-libs/gst/va/meson.build -@@ -32,14 +32,20 @@ if host_system != 'linux' - endif - - va_opt = get_option('va') --msdk_opt = get_option('msdk') --qsv_opt = get_option('qsv') --if va_opt.disabled() and msdk_opt.disabled() and qsv_opt.disabled() -- subdir_done() -+if host_system == 'linux' -+ msdk_opt = get_option('msdk') -+ qsv_opt = get_option('qsv') -+ if va_opt.disabled() and msdk_opt.disabled() and qsv_opt.disabled() -+ subdir_done() -+ endif -+ va_required = va_opt.enabled() or msdk_opt.enabled() or qsv_opt.enabled() -+else -+ if va_opt.disabled() -+ subdir_done() -+ endif -+ va_required = va_opt - endif - --va_required = va_opt.enabled() or msdk_opt.enabled() or qsv_opt.enabled() -- - libva_req = ['>= 1.6'] - libva_dep = dependency('libva', version: libva_req, required: va_required, - fallback: ['libva', 'libva_dep']) -@@ -50,7 +56,7 @@ if not (libva_dep.found() and libva_drm_dep.found()) - subdir_done() - endif - --libdrm_dep = dependency('libdrm', version: '>=2.4', required: false) -+libdrm_dep = dependency('libdrm', version: '>=2.4', required: get_option('drm')) - cdata.set10('HAVE_LIBDRM', libdrm_dep.found()) - - va_enums = gnome.mkenums_simple('va-enumtypes', ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -73,6 +73,8 @@ option('y4m', type : 'feature', value : 'auto') - option('opencv', type : 'feature', value : 'auto', description : 'OpenCV computer vision library support') - - # Feature options for optional deps in plugins -+option('drm', type : 'feature', value : 'auto', description: 'libdrm support in the GstVA library') -+option('udev', type : 'feature', value : 'auto', description: 'gudev support in the new VA-API plugin') - option('wayland', type : 'feature', value : 'auto', description : 'Wayland plugin/library, support in the Vulkan plugin') - option('x11', type : 'feature', value : 'auto', description : 'X11 support in Vulkan, GL and rfb plugins') - ---- a/sys/va/meson.build -+++ b/sys/va/meson.build -@@ -33,7 +33,7 @@ if va_option.disabled() - subdir_done() - endif - --libgudev_dep = dependency('gudev-1.0', required: false) -+libgudev_dep = dependency('gudev-1.0', required: get_option('udev'), allow_fallback: true) - cdata.set10('HAVE_GUDEV', libgudev_dep.found()) - - if libva_dep.version().version_compare('>= 1.8') --- -2.40.1 diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.11-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.11-r1.ebuild deleted file mode 100644 index c462b7d76f65a..0000000000000 --- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.11-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GST_ORG_MODULE="gst-plugins-bad" -inherit gstreamer-meson - -DESCRIPTION="Less plugins for GStreamer" -HOMEPAGE="https://gstreamer.freedesktop.org/" - -LICENSE="LGPL-2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" - -IUSE="X bzip2 +introspection +orc udev vaapi vnc wayland" - -# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin -# 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},introspection?] - 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}] ) - - vaapi? ( - >=media-libs/libva-1.10:=[${MULTILIB_USEDEP}] - udev? ( dev-libs/libgudev[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND="dev-util/glib-utils" - -DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE ) - -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="bz2 hls ipcpipeline librfb shm va wayland" - - local emesonargs=( - -Dshm=enabled - -Dipcpipeline=enabled - -Dhls=disabled - $(meson_feature bzip2 bz2) - $(meson_feature vaapi va) - -Dudev=$(usex udev $(usex vaapi enabled disabled) disabled) - $(meson_feature vnc librfb) - -Dx11=$(usex X $(usex vnc enabled disabled) disabled) - $(meson_feature wayland) - ) - - gstreamer_multilib_src_configure -} - -multilib_src_test() { - # Tests are slower than upstream expects - CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test -} diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.12.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.12.ebuild deleted file mode 100644 index b2a1bf3d89dce..0000000000000 --- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.12.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GST_ORG_MODULE="gst-plugins-bad" -inherit gstreamer-meson - -DESCRIPTION="Less plugins for GStreamer" -HOMEPAGE="https://gstreamer.freedesktop.org/" - -LICENSE="LGPL-2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" - -IUSE="X bzip2 +introspection +orc udev vaapi vnc wayland" - -# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin -# 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},introspection?] - 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}] ) - - vaapi? ( - >=media-libs/libva-1.10:=[${MULTILIB_USEDEP}] - udev? ( dev-libs/libgudev[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND="dev-util/glib-utils" - -DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE ) - -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="bz2 hls ipcpipeline librfb shm va wayland" - - local emesonargs=( - -Dshm=enabled - -Dipcpipeline=enabled - -Dhls=disabled - $(meson_feature bzip2 bz2) - $(meson_feature vaapi va) - -Dudev=$(usex udev $(usex vaapi enabled disabled) disabled) - $(meson_feature vnc librfb) - -Dx11=$(usex X $(usex vnc enabled disabled) disabled) - $(meson_feature wayland) - ) - - gstreamer_multilib_src_configure -} - -multilib_src_test() { - # Tests are slower than upstream expects - CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test -}