* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-bad/, media-libs/gst-plugins-bad/files/
@ 2019-06-20 21:28 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2019-06-20 21:28 UTC (permalink / raw
To: gentoo-commits
commit: f40883880bb1ae615a4adf1440a15afa2ad7ad1c
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 21:21:32 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 21:28:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4088388
media-libs/gst-plugins-bad: remove gstreamer 0.10
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/gst-plugins-bad/Manifest | 2 -
.../gst-plugins-bad-0.10.23-CVE-2015-0797.patch | 30 ------------
.../gst-plugins-bad-0.10.23-r4.ebuild | 57 ----------------------
3 files changed, 89 deletions(-)
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 1b854ff5250..9fd3b6a7d64 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,3 +1 @@
-DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 BLAKE2B 90ad2a742de6d6b3efedb1a2fc16a9f24cf0566fd455a27f113afa0fc2ceff5f2517a31e8db8ed6ed8b4c92595b333a29dbb451077975f3d726808976f4a8671 SHA512 528ed30edb544dd970047fd4b0f05bf75f9f49f07a8118f805430c56c3ec75643013799491aeba70c62cb0343cd3e72758bf5c167d00e90a6a3f13857e4860e1
-DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
diff --git a/media-libs/gst-plugins-bad/files/gst-plugins-bad-0.10.23-CVE-2015-0797.patch b/media-libs/gst-plugins-bad/files/gst-plugins-bad-0.10.23-CVE-2015-0797.patch
deleted file mode 100644
index b1e323b9c0e..00000000000
--- a/media-libs/gst-plugins-bad/files/gst-plugins-bad-0.10.23-CVE-2015-0797.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Ralph Giles <giles@mozilla.com>
-Subject: Fix buffer overflow in mp4 parsing
-
---- gst-plugins-bad0.10-0.10.23.orig/gst/videoparsers/gsth264parse.c
-+++ gst-plugins-bad0.10-0.10.23/gst/videoparsers/gsth264parse.c
-@@ -384,6 +384,11 @@ gst_h264_parse_wrap_nal (GstH264Parse *
-
- GST_DEBUG_OBJECT (h264parse, "nal length %d", size);
-
-+ if (size > G_MAXUINT32 - nl) {
-+ GST_ELEMENT_ERROR (h264parse, STREAM, FAILED, (NULL),
-+ ("overflow in nal size"));
-+ return NULL;
-+ }
- buf = gst_buffer_new_and_alloc (size + nl + 4);
- if (format == GST_H264_PARSE_FORMAT_AVC) {
- GST_WRITE_UINT32_BE (GST_BUFFER_DATA (buf), size << (32 - 8 * nl));
-@@ -452,6 +457,11 @@ gst_h264_parse_process_nal (GstH264Parse
- GST_DEBUG_OBJECT (h264parse, "not processing nal size %u", nalu->size);
- return;
- }
-+ if (G_UNLIKELY (nalu->size > 20 * 1024 * 1024)) {
-+ GST_DEBUG_OBJECT (h264parse, "not processing nal size %u (too big)",
-+ nalu->size);
-+ return;
-+ }
-
- /* we have a peek as well */
- nal_type = nalu->type;
-
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild
deleted file mode 100644
index aeb407b8379..00000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GST_ORG_MODULE="gst-plugins-bad"
-inherit eutils flag-o-matic gstreamer
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI+=" https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-h264-patches.tar.xz"
-
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="+orc"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-0.10.36:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-0.10.36:${SLOT}[${MULTILIB_USEDEP}]
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- !<media-plugins/gst-plugins-farsight-0.12.11:${SLOT}"
-
-src_prepare() {
- # Patches from 0.10 branch fixing h264 baseline decoding; bug #446384
- epatch "${WORKDIR}/${P}-h264-patches"/*.patch
- # Fix CVE-2015-0797, bug #553742
- epatch "${FILESDIR}"/${P}-CVE-2015-0797.patch
-}
-
-src_configure() {
- strip-flags
- replace-flags "-O3" "-O2"
- filter-flags "-fprefetch-loop-arrays" # (Bug #22249)
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- # Disable vnmc and nsf plugins due to security bug 600142
- gstreamer_multilib_src_configure \
- --disable-nsf \
- --disable-vmnc \
- $(use_enable orc) \
- --disable-examples \
- --disable-debug \
- --disable-static
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog NEWS README RELEASE"
- einstalldocs
- prune_libtool_files --modules
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-bad/, media-libs/gst-plugins-bad/files/
@ 2020-03-18 11:22 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-03-18 11:22 UTC (permalink / raw
To: gentoo-commits
commit: 58f82ad01331675e463f3dc33e1b5b2c1f69a1a0
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 11:22:13 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 11:22:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f82ad0
media-libs/gst-plugins-bad: Fix for >=make-4.3
Closes: https://bugs.gentoo.org/705974
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/gst-plugins-bad-1.14.5-make43.patch | 227 +++++++++++++++++++++
.../gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild | 4 +
2 files changed, 231 insertions(+)
diff --git a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.14.5-make43.patch b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.14.5-make43.patch
new file mode 100644
index 00000000000..37d72b9f7e8
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.14.5-make43.patch
@@ -0,0 +1,227 @@
+--- a/common/glib-gen.mak
++++ b/common/glib-gen.mak
+@@ -1,11 +1,13 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_enum_prefix=gst_color_balance
+
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+
+ # these are all the rules generating the relevant files
+ %-marshal.h: %-marshal.list
+--- a/common/gst-glib-gen.mak
++++ b/common/gst-glib-gen.mak
+@@ -1,14 +1,16 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
+--- a/ext/srt/Makefile.in
++++ b/ext/srt/Makefile.in
+@@ -17,12 +17,14 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+
+
+ VPATH = @srcdir@
+@@ -795,7 +797,7 @@
+ gstsrtserversink.h \
+ $(NULL)
+
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ all: all-am
+
+ .SUFFIXES:
+--- a/ext/srtp/Makefile.in
++++ b/ext/srtp/Makefile.in
+@@ -17,12 +17,14 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+
+ VPATH = @srcdir@
+ am__is_gnu_make = { \
+@@ -775,7 +777,7 @@
+ BUILT_SOURCES = gstsrtp-enumtypes.c gstsrtp-enumtypes.h
+ nodist_libgstsrtp_la_SOURCES = $(BUILT_SOURCES)
+ CLEANFILES = $(BUILT_SOURCES)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+--- a/ext/webrtc/Makefile.in
++++ b/ext/webrtc/Makefile.in
+@@ -17,12 +17,14 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+
+
+ VPATH = @srcdir@
+@@ -797,7 +799,7 @@
+
+ libgstwebrtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ libgstwebrtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ all: all-am
+
+ .SUFFIXES:
+--- a/gst-libs/gst/interfaces/Makefile.in
++++ b/gst-libs/gst/interfaces/Makefile.in
+@@ -17,12 +17,14 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+
+
+ VPATH = @srcdir@
+@@ -773,7 +775,7 @@
+ glib_gen_prefix = gst_photography
+ glib_gen_basename = photography
+ glib_gen_decl_banner = GST_PHOTOGRAPHY_API
+-glib_gen_decl_include = \#include <gst/interfaces/photography-prelude.h>
++glib_gen_decl_include = $(H)include <gst/interfaces/photography-prelude.h>
+ built_sources = \
+ photography-enumtypes.c
+
+@@ -805,7 +807,7 @@
+ $(built_headers)
+
+ CLEANFILES = $(BUILT_SOURCES)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+--- a/gst-libs/gst/mpegts/Makefile.in
++++ b/gst-libs/gst/mpegts/Makefile.in
+@@ -17,12 +17,14 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+
+
+
+@@ -821,7 +823,7 @@
+ glib_gen_prefix = gst_mpegts
+ glib_gen_basename = gstmpegts
+ glib_gen_decl_banner = GST_MPEGTS_API
+-glib_gen_decl_include = \#include <gst/mpegts/mpegts-prelude.h>
++glib_gen_decl_include = $(H)include <gst/mpegts/mpegts-prelude.h>
+ BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
+ nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
+ CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
+@@ -841,7 +843,7 @@
+ @HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES)
+ @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
+ @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+--- a/gst-libs/gst/webrtc/Makefile.in
++++ b/gst-libs/gst/webrtc/Makefile.in
+@@ -17,12 +17,14 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+
+
+
+@@ -761,7 +763,7 @@
+ glib_gen_prefix = gst_webrtc
+ glib_gen_basename = webrtc
+ glib_gen_decl_banner = GST_WEBRTC_API
+-glib_gen_decl_include = \#include <gst/webrtc/webrtc_fwd.h>
++glib_gen_decl_include = $(H)include <gst/webrtc/webrtc_fwd.h>
+ built_sources = webrtc-enumtypes.c
+ built_headers = webrtc-enumtypes.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+@@ -806,7 +808,7 @@
+ $(GST_ALL_LDFLAGS) \
+ $(GST_LT_LDFLAGS)
+
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstWebRTC-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@include_HEADERS))
+ @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@_la_SOURCES)) $(BUILT_SOURCES)
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
index 76fd41bbffe..0e1a40ea331 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND}
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
+)
+
src_prepare() {
default
addpredict /dev # Prevent sandbox violations bug #570624
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-bad/, media-libs/gst-plugins-bad/files/
@ 2023-06-01 3:11 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-06-01 3:11 UTC (permalink / raw
To: gentoo-commits
commit: b70fd2a58e50cd4104cd5dca5a975170e758b22e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 1 02:44:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 1 03:09:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b70fd2a5
media-libs/gst-plugins-bad: avoid automagic dep on libva
As noted on the bug, I need to discuss properly with leio whether or not the
split for -va makes sense, but -va is an orphan/leaf package right now so it's
lower priority than just fixing -bad which many people have installed. So, for now,
just backport the relevant upstream patches to fix the automagic for this side.
Bug: https://bugs.gentoo.org/907481
Bug: https://bugs.gentoo.org/907479
Signed-off-by: Sam James <sam <AT> gentoo.org>
...son-Fix-libdrm-and-vaapi-configure-checks.patch | 65 ++++++++++++++
...eature-options-for-optional-va-deps-libdr.patch | 76 ++++++++++++++++
.../gst-plugins-bad-1.22.3-r1.ebuild | 100 +++++++++++++++++++++
3 files changed, 241 insertions(+)
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
new file mode 100644
index 000000000000..ef944db920c2
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch
@@ -0,0 +1,65 @@
+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 <nirbheek@centricular.com>
+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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428>
+--- 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
new file mode 100644
index 000000000000..55ea57fa8128
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch
@@ -0,0 +1,76 @@
+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 <nirbheek@centricular.com>
+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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428>
+Signed-off-by: Sam James <sam@gentoo.org>
+--- 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.3-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r1.ebuild
new file mode 100644
index 000000000000..86417a3c6347
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r1.ebuild
@@ -0,0 +1,100 @@
+# 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_{8,9,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 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-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 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-01 3:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-20 21:28 [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-bad/, media-libs/gst-plugins-bad/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2020-03-18 11:22 David Seifert
2023-06-01 3:11 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox