* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-base/, media-libs/gst-plugins-base/files/
@ 2020-03-18 11:22 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-03-18 11:22 UTC (permalink / raw
To: gentoo-commits
commit: a1187bb0a41157cee36a4864ce1ff710dad4c9a1
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 11:22:16 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 11:22:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1187bb0
media-libs/gst-plugins-base: 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-base-1.14.5-make43.patch | 312 +++++++++++++++++++++
.../gst-plugins-base-1.14.5-r1.ebuild | 4 +
2 files changed, 316 insertions(+)
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.14.5-make43.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.14.5-make43.patch
new file mode 100644
index 00000000000..04b2924376b
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.14.5-make43.patch
@@ -0,0 +1,312 @@
+--- 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/gst/encoding/Makefile.in
++++ b/gst/encoding/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@
+@@ -638,7 +640,7 @@
+ gstsmartencoder.h \
+ gststreamcombinerpad.h
+
+-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/app/Makefile.in
++++ b/gst-libs/gst/app/Makefile.in
+@@ -17,13 +17,15 @@
+ # 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@
+@@ -618,12 +620,12 @@
+ glib_gen_prefix = __gst_app
+ glib_gen_basename = app
+ glib_gen_decl_banner = GST_APP_API
+-glib_gen_decl_include = \#include <gst/app/app-prelude.h>
++glib_gen_decl_include = $(H)include <gst/app/app-prelude.h>
+ glib_enum_headers = gstappsrc.h
+ built_sources = app-enumtypes.c
+ built_headers = app-enumtypes.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
+ nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
+ libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+--- a/gst-libs/gst/audio/Makefile.in
++++ b/gst-libs/gst/audio/Makefile.in
+@@ -39,13 +39,15 @@
+ # 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@
+@@ -784,7 +786,7 @@
+ glib_gen_prefix = gst_audio
+ glib_gen_basename = audio
+ glib_gen_decl_banner = GST_AUDIO_API
+-glib_gen_decl_include = \#include <gst/audio/audio-prelude.h>
++glib_gen_decl_include = $(H)include <gst/audio/audio-prelude.h>
+ built_sources = audio-enumtypes.c
+ built_headers = audio-enumtypes.h
+ lib_LTLIBRARIES = \
+@@ -895,7 +897,7 @@
+ @HAVE_X86_TRUE@ $(GST_LIB_LDFLAGS) \
+ @HAVE_X86_TRUE@ $(GST_ALL_LDFLAGS)
+
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+
+ # Introspection
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir
+--- a/gst-libs/gst/pbutils/Makefile.in
++++ b/gst-libs/gst/pbutils/Makefile.in
+@@ -17,13 +17,15 @@
+ # 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@
+@@ -664,6 +666,7 @@
+ gstdiscoverer.h \
+ gstaudiovisualizer.h
+
++H := \#
+
+ # variables used for enum/marshal generation
+ glib_enum_headers = $(headers_pbutils)
+@@ -671,7 +674,7 @@
+ glib_gen_prefix = pbutils
+ glib_gen_basename = pbutils
+ glib_gen_decl_banner = GST_PBUTILS_API
+-glib_gen_decl_include = \#include <gst/pbutils/pbutils-prelude.h>
++glib_gen_decl_include = $(H)include <gst/pbutils/pbutils-prelude.h>
+ built_headers_configure = \
+ gstpluginsbaseversion.h
+
+@@ -719,7 +722,7 @@
+
+ # DISTCLEANFILES is for files generated by configure
+ DISTCLEANFILES = $(built_headers_configure)
+-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 = GstPbutils-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@ $(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \
+--- a/gst-libs/gst/rtp/Makefile.in
++++ b/gst-libs/gst/rtp/Makefile.in
+@@ -17,13 +17,15 @@
+ # 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@
+@@ -675,8 +677,8 @@
+ glib_enum_headers = $(libgstrtpinclude_HEADERS)
+ glib_gen_basename = gstrtp
+ glib_gen_decl_banner = GST_RTP_API
+-glib_gen_decl_include = \#include <gst/rtp/rtp-prelude.h>
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++glib_gen_decl_include = $(H)include <gst/rtp/rtp-prelude.h>
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@ $(libgstrtpinclude_HEADERS)) \
+--- a/gst-libs/gst/rtsp/Makefile.in
++++ b/gst-libs/gst/rtsp/Makefile.in
+@@ -17,13 +17,15 @@
+ # 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@
+@@ -679,8 +681,8 @@
+ glib_enum_headers = $(libgstrtspinclude_HEADERS)
+ glib_gen_basename = gstrtsp
+ glib_gen_decl_banner = GST_RTSP_API
+-glib_gen_decl_include = \#include <gst/rtsp/rtsp-prelude.h>
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++glib_gen_decl_include = $(H)include <gst/rtsp/rtsp-prelude.h>
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@ $(libgstrtspinclude_HEADERS)) \
+--- a/gst-libs/gst/tag/Makefile.in
++++ b/gst-libs/gst/tag/Makefile.in
+@@ -17,13 +17,15 @@
+ # 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@
+@@ -680,12 +682,12 @@
+ glib_gen_prefix = gst_tag
+ glib_gen_basename = tag
+ glib_gen_decl_banner = GST_TAG_API
+-glib_gen_decl_include = \#include <gst/tag/tag-prelude.h>
++glib_gen_decl_include = $(H)include <gst/tag/tag-prelude.h>
+ glib_enum_headers = tag.h gsttagdemux.h
+ built_sources = tag-enumtypes.c
+ built_headers = tag-enumtypes.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ libgsttaginclude_HEADERS = \
+ tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h
+
+--- a/gst-libs/gst/video/Makefile.in
++++ b/gst-libs/gst/video/Makefile.in
+@@ -39,13 +39,15 @@
+ # 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@
+@@ -740,7 +742,7 @@
+ glib_gen_prefix = gst_video
+ glib_gen_basename = video
+ glib_gen_decl_banner = GST_VIDEO_API
+-glib_gen_decl_include = \#include <gst/video/video-prelude.h>
++glib_gen_decl_include = $(H)include <gst/video/video-prelude.h>
+ built_sources = video-enumtypes.c
+ built_headers = video-enumtypes.h
+ lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
+@@ -821,7 +823,7 @@
+
+ libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
+ libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(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 = GstVideo-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@ $(libgstvideo_@GST_API_VERSION@include_HEADERS)) \
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
index 83bcb9e58c1..5c5d3234839 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
@@ -90,6 +90,10 @@ DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
+)
+
src_prepare() {
# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-base/, media-libs/gst-plugins-base/files/
@ 2021-02-20 9:42 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2021-02-20 9:42 UTC (permalink / raw
To: gentoo-commits
commit: b09e46862d7e48b495533bb480f3618985ee7d6a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 09:41:02 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 09:41:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b09e4686
media-libs/gst-plugins-base: remove old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/gst-plugins-base/Manifest | 2 -
.../files/gst-plugins-base-1.14.5-make43.patch | 312 ------------------
.../files/gst-plugins-base-1.16.2-make43.patch | 347 ---------------------
.../gst-plugins-base-1.14.5-r1.ebuild | 185 -----------
.../gst-plugins-base-1.14.5.ebuild | 181 -----------
.../gst-plugins-base-1.16.2.ebuild | 185 -----------
6 files changed, 1212 deletions(-)
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index ea317c7f17b..425c117366c 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,3 +1 @@
-DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
-DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.14.5-make43.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.14.5-make43.patch
deleted file mode 100644
index 04b2924376b..00000000000
--- a/media-libs/gst-plugins-base/files/gst-plugins-base-1.14.5-make43.patch
+++ /dev/null
@@ -1,312 +0,0 @@
---- 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/gst/encoding/Makefile.in
-+++ b/gst/encoding/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@
-@@ -638,7 +640,7 @@
- gstsmartencoder.h \
- gststreamcombinerpad.h
-
--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/app/Makefile.in
-+++ b/gst-libs/gst/app/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -618,12 +620,12 @@
- glib_gen_prefix = __gst_app
- glib_gen_basename = app
- glib_gen_decl_banner = GST_APP_API
--glib_gen_decl_include = \#include <gst/app/app-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/app/app-prelude.h>
- glib_enum_headers = gstappsrc.h
- built_sources = app-enumtypes.c
- built_headers = app-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
- nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
- libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
---- a/gst-libs/gst/audio/Makefile.in
-+++ b/gst-libs/gst/audio/Makefile.in
-@@ -39,13 +39,15 @@
- # 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@
-@@ -784,7 +786,7 @@
- glib_gen_prefix = gst_audio
- glib_gen_basename = audio
- glib_gen_decl_banner = GST_AUDIO_API
--glib_gen_decl_include = \#include <gst/audio/audio-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/audio/audio-prelude.h>
- built_sources = audio-enumtypes.c
- built_headers = audio-enumtypes.h
- lib_LTLIBRARIES = \
-@@ -895,7 +897,7 @@
- @HAVE_X86_TRUE@ $(GST_LIB_LDFLAGS) \
- @HAVE_X86_TRUE@ $(GST_ALL_LDFLAGS)
-
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
-
- # Introspection
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir
---- a/gst-libs/gst/pbutils/Makefile.in
-+++ b/gst-libs/gst/pbutils/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -664,6 +666,7 @@
- gstdiscoverer.h \
- gstaudiovisualizer.h
-
-+H := \#
-
- # variables used for enum/marshal generation
- glib_enum_headers = $(headers_pbutils)
-@@ -671,7 +674,7 @@
- glib_gen_prefix = pbutils
- glib_gen_basename = pbutils
- glib_gen_decl_banner = GST_PBUTILS_API
--glib_gen_decl_include = \#include <gst/pbutils/pbutils-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/pbutils/pbutils-prelude.h>
- built_headers_configure = \
- gstpluginsbaseversion.h
-
-@@ -719,7 +722,7 @@
-
- # DISTCLEANFILES is for files generated by configure
- DISTCLEANFILES = $(built_headers_configure)
--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 = GstPbutils-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@ $(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \
---- a/gst-libs/gst/rtp/Makefile.in
-+++ b/gst-libs/gst/rtp/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -675,8 +677,8 @@
- glib_enum_headers = $(libgstrtpinclude_HEADERS)
- glib_gen_basename = gstrtp
- glib_gen_decl_banner = GST_RTP_API
--glib_gen_decl_include = \#include <gst/rtp/rtp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtp/rtp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@ $(libgstrtpinclude_HEADERS)) \
---- a/gst-libs/gst/rtsp/Makefile.in
-+++ b/gst-libs/gst/rtsp/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -679,8 +681,8 @@
- glib_enum_headers = $(libgstrtspinclude_HEADERS)
- glib_gen_basename = gstrtsp
- glib_gen_decl_banner = GST_RTSP_API
--glib_gen_decl_include = \#include <gst/rtsp/rtsp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtsp/rtsp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@ $(libgstrtspinclude_HEADERS)) \
---- a/gst-libs/gst/tag/Makefile.in
-+++ b/gst-libs/gst/tag/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -680,12 +682,12 @@
- glib_gen_prefix = gst_tag
- glib_gen_basename = tag
- glib_gen_decl_banner = GST_TAG_API
--glib_gen_decl_include = \#include <gst/tag/tag-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/tag/tag-prelude.h>
- glib_enum_headers = tag.h gsttagdemux.h
- built_sources = tag-enumtypes.c
- built_headers = tag-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgsttaginclude_HEADERS = \
- tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h
-
---- a/gst-libs/gst/video/Makefile.in
-+++ b/gst-libs/gst/video/Makefile.in
-@@ -39,13 +39,15 @@
- # 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@
-@@ -740,7 +742,7 @@
- glib_gen_prefix = gst_video
- glib_gen_basename = video
- glib_gen_decl_banner = GST_VIDEO_API
--glib_gen_decl_include = \#include <gst/video/video-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/video/video-prelude.h>
- built_sources = video-enumtypes.c
- built_headers = video-enumtypes.h
- lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
-@@ -821,7 +823,7 @@
-
- libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
- libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(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 = GstVideo-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@ $(libgstvideo_@GST_API_VERSION@include_HEADERS)) \
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch
deleted file mode 100644
index f8121962918..00000000000
--- a/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch
+++ /dev/null
@@ -1,347 +0,0 @@
---- 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/gst/encoding/Makefile.in
-+++ b/gst/encoding/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@
-@@ -638,7 +640,7 @@
- gstsmartencoder.h \
- gststreamcombinerpad.h
-
--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/app/Makefile.in
-+++ b/gst-libs/gst/app/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -618,12 +620,12 @@
- glib_gen_prefix = __gst_app
- glib_gen_basename = app
- glib_gen_decl_banner = GST_APP_API
--glib_gen_decl_include = \#include <gst/app/app-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/app/app-prelude.h>
- glib_enum_headers = gstappsrc.h
- built_sources = app-enumtypes.c
- built_headers = app-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
- nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
- libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
---- a/gst-libs/gst/audio/Makefile.in
-+++ b/gst-libs/gst/audio/Makefile.in
-@@ -39,13 +39,15 @@
- # 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@
-@@ -784,7 +786,7 @@
- glib_gen_prefix = gst_audio
- glib_gen_basename = audio
- glib_gen_decl_banner = GST_AUDIO_API
--glib_gen_decl_include = \#include <gst/audio/audio-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/audio/audio-prelude.h>
- built_sources = audio-enumtypes.c
- built_headers = audio-enumtypes.h
- lib_LTLIBRARIES = \
-@@ -895,7 +897,7 @@
- @HAVE_X86_TRUE@ $(GST_LIB_LDFLAGS) \
- @HAVE_X86_TRUE@ $(GST_ALL_LDFLAGS)
-
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
-
- # Introspection
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir
---- a/gst-libs/gst/pbutils/Makefile.in
-+++ b/gst-libs/gst/pbutils/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -664,6 +666,7 @@
- gstdiscoverer.h \
- gstaudiovisualizer.h
-
-+H := \#
-
- # variables used for enum/marshal generation
- glib_enum_headers = $(headers_pbutils)
-@@ -671,7 +674,7 @@
- glib_gen_prefix = pbutils
- glib_gen_basename = pbutils
- glib_gen_decl_banner = GST_PBUTILS_API
--glib_gen_decl_include = \#include <gst/pbutils/pbutils-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/pbutils/pbutils-prelude.h>
- built_headers_configure = \
- gstpluginsbaseversion.h
-
-@@ -719,7 +722,7 @@
-
- # DISTCLEANFILES is for files generated by configure
- DISTCLEANFILES = $(built_headers_configure)
--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 = GstPbutils-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@ $(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \
---- a/gst-libs/gst/rtp/Makefile.in
-+++ b/gst-libs/gst/rtp/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -675,8 +677,8 @@
- glib_enum_headers = $(libgstrtpinclude_HEADERS)
- glib_gen_basename = gstrtp
- glib_gen_decl_banner = GST_RTP_API
--glib_gen_decl_include = \#include <gst/rtp/rtp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtp/rtp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@ $(libgstrtpinclude_HEADERS)) \
---- a/gst-libs/gst/rtsp/Makefile.in
-+++ b/gst-libs/gst/rtsp/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -679,8 +681,8 @@
- glib_enum_headers = $(libgstrtspinclude_HEADERS)
- glib_gen_basename = gstrtsp
- glib_gen_decl_banner = GST_RTSP_API
--glib_gen_decl_include = \#include <gst/rtsp/rtsp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtsp/rtsp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@ $(libgstrtspinclude_HEADERS)) \
---- a/gst-libs/gst/tag/Makefile.in
-+++ b/gst-libs/gst/tag/Makefile.in
-@@ -17,13 +17,15 @@
- # 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@
-@@ -680,12 +682,12 @@
- glib_gen_prefix = gst_tag
- glib_gen_basename = tag
- glib_gen_decl_banner = GST_TAG_API
--glib_gen_decl_include = \#include <gst/tag/tag-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/tag/tag-prelude.h>
- glib_enum_headers = tag.h gsttagdemux.h
- built_sources = tag-enumtypes.c
- built_headers = tag-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgsttaginclude_HEADERS = \
- tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h
-
---- a/gst-libs/gst/video/Makefile.in
-+++ b/gst-libs/gst/video/Makefile.in
-@@ -39,13 +39,15 @@
- # 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@
-@@ -740,7 +742,7 @@
- glib_gen_prefix = gst_video
- glib_gen_basename = video
- glib_gen_decl_banner = GST_VIDEO_API
--glib_gen_decl_include = \#include <gst/video/video-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/video/video-prelude.h>
- built_sources = video-enumtypes.c
- built_headers = video-enumtypes.h
- lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
-@@ -821,7 +823,7 @@
-
- libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
- libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(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 = GstVideo-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@ $(libgstvideo_@GST_API_VERSION@include_HEADERS)) \
---- a/gst-libs/gst/gl/Makefile.in
-+++ b/gst-libs/gst/gl/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>
-
-
-
-@@ -863,14 +865,14 @@ glib_enum_define = GST_GL
- glib_gen_prefix = gst_gl
- glib_gen_basename = gl
- glib_gen_decl_banner = GST_GL_API
--glib_gen_decl_include = \#include <gst/gl/gl-prelude.h>
-+glib_gen_decl_include = ${H}include <gst/gl/gl-prelude.h>
- built_sources = gl-enumtypes.c
- built_headers = gl-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
- CLEANFILES = $(BUILT_SOURCES) $(am__append_27)
- nodist_libgstgl_@GST_API_VERSION@include_HEADERS = $(built_headers)
- nodist_libgstgl_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
--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 = GstGL-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@ $(gstgl_gir_headers)) $(patsubst \
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
deleted file mode 100644
index 94060e0598b..00000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-
-# For OpenGL we have three separate concepts, with a list of possibilities in each:
-# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
-# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
-# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
-# With the following limitations:
-# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
-# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
-# * glx platform requires opengl API
-# * wayland, gbm and most other non-glx WSIs require egl platform
-# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
-# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
-# and libpng/jpeg are required for gloverlay element;
-
-# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
-IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
-GL_REQUIRED_USE="
- || ( gbm wayland X )
- wayland? ( egl )
- gbm? ( egl )
-"
-REQUIRED_USE="
- ivorbis? ( ogg )
- theora? ( ogg )
- vorbis? ( ogg )
- opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
- gles2? ( egl ${GL_REQUIRED_USE} )
-"
-
-# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
-# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
-GL_DEPS="
- >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
- egl? (
- x11-libs/libdrm
- )
- gbm? (
- >=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
- >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
- )
- wayland? (
- dev-libs/wayland[${MULTILIB_USEDEP}]
- )
-
- >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
- media-libs/libpng:0[${MULTILIB_USEDEP}]
- virtual/jpeg:0[${MULTILIB_USEDEP}]
-" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
-
-RDEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
- ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
- ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
- orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
- pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
- theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
- vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- )
-
- gles2? ( ${GL_DEPS} )
- opengl? ( ${GL_DEPS} )
-
- !<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.12
- X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
-)
-
-src_prepare() {
- # Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
- sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
- default
-}
-
-multilib_src_configure() {
- filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
- local myconf=()
- # FIXME: Automagic gbm and x11 wsi
- if use opengl || use gles2; then
- myconf+=(
- --enable-gl
- $(use_enable egl)
- $(use_enable gles2)
- $(use_enable opengl)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- else
- myconf+=(
- --disable-gl
- --disable-egl
- --disable-gles2
- --disable-opengl
- --disable-wayland
- --disable-x11
- )
- fi
-
- if use opengl && use X; then
- # GLX requires desktop OpenGL and X
- myconf+=( --enable-glx )
- else
- myconf+=( --disable-glx )
- fi
-
- myconf+=(
- --disable-cocoa
- --disable-dispmanx
- --disable-wgl
- )
-
- gstreamer_multilib_src_configure \
- $(use_enable alsa) \
- $(multilib_native_use_enable introspection) \
- $(use_enable ivorbis) \
- $(use_enable ogg) \
- $(use_enable orc) \
- $(use_enable pango) \
- $(use_enable theora) \
- $(use_enable vorbis) \
- $(use_enable X x) \
- $(use_enable X xshm) \
- $(use_enable X xvideo) \
- --enable-iso-codes \
- --enable-zlib \
- --disable-debug \
- --disable-examples \
- --disable-static \
- "${myconf[@]}"
-
- # bug #366931, flag-o-matic for the whole thing is overkill
- if [[ ${CHOST} == *86-*-darwin* ]] ; then
- sed -i \
- -e '/FLAGS = /s|-O[23]|-O1|g' \
- gst/audioconvert/Makefile \
- gst/volume/Makefile || die
- fi
-
- if multilib_is_native_abi; then
- local x
- for x in libs plugins; do
- ln -s "${S}"/docs/${x}/html docs/${x}/html || die
- done
- fi
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS NEWS README RELEASE"
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
- unset GSETTINGS_BACKEND
- emake check
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
deleted file mode 100644
index 8b1ba0f1441..00000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-# For OpenGL we have three separate concepts, with a list of possibilities in each:
-# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
-# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
-# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
-# With the following limitations:
-# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
-# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
-# * glx platform requires opengl API
-# * wayland, gbm and most other non-glx WSIs require egl platform
-# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
-# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
-# and libpng/jpeg are required for gloverlay element;
-
-# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
-IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
-GL_REQUIRED_USE="
- || ( gbm wayland X )
- wayland? ( egl )
- gbm? ( egl )
-"
-REQUIRED_USE="
- ivorbis? ( ogg )
- theora? ( ogg )
- vorbis? ( ogg )
- opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
- gles2? ( egl ${GL_REQUIRED_USE} )
-"
-
-# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
-# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
-GL_DEPS="
- >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
- egl? (
- x11-libs/libdrm
- )
- gbm? (
- >=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
- >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
- )
- wayland? (
- dev-libs/wayland[${MULTILIB_USEDEP}]
- )
-
- media-libs/libpng:0[${MULTILIB_USEDEP}]
- virtual/jpeg:0[${MULTILIB_USEDEP}]
-" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
-# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
-
-RDEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
- ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
- ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
- orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
- pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
- theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
- vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- )
-
- gles2? ( ${GL_DEPS} )
- opengl? ( ${GL_DEPS} )
-
- !<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.12
- X? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
- # Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
- sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
- default
-}
-
-multilib_src_configure() {
- filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
- local myconf=()
- # FIXME: Automagic gbm and x11 wsi
- if use opengl || use gles2; then
- myconf+=(
- --enable-gl
- $(use_enable egl)
- $(use_enable gles2)
- $(use_enable opengl)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- else
- myconf+=(
- --disable-gl
- --disable-egl
- --disable-gles2
- --disable-opengl
- --disable-wayland
- --disable-x11
- )
- fi
-
- if use opengl && use X; then
- # GLX requires desktop OpenGL and X
- myconf+=( --enable-glx )
- else
- myconf+=( --disable-glx )
- fi
-
- myconf+=(
- --disable-cocoa
- --disable-dispmanx
- --disable-wgl
- )
-
- gstreamer_multilib_src_configure \
- $(use_enable alsa) \
- $(multilib_native_use_enable introspection) \
- $(use_enable ivorbis) \
- $(use_enable ogg) \
- $(use_enable orc) \
- $(use_enable pango) \
- $(use_enable theora) \
- $(use_enable vorbis) \
- $(use_enable X x) \
- $(use_enable X xshm) \
- $(use_enable X xvideo) \
- --enable-iso-codes \
- --enable-zlib \
- --disable-debug \
- --disable-examples \
- --disable-static \
- "${myconf[@]}"
-
- # bug #366931, flag-o-matic for the whole thing is overkill
- if [[ ${CHOST} == *86-*-darwin* ]] ; then
- sed -i \
- -e '/FLAGS = /s|-O[23]|-O1|g' \
- gst/audioconvert/Makefile \
- gst/volume/Makefile || die
- fi
-
- if multilib_is_native_abi; then
- local x
- for x in libs plugins; do
- ln -s "${S}"/docs/${x}/html docs/${x}/html || die
- done
- fi
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS NEWS README RELEASE"
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
- unset GSETTINGS_BACKEND
- emake check
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
deleted file mode 100644
index 6aeb1095638..00000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-
-# For OpenGL we have three separate concepts, with a list of possibilities in each:
-# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
-# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
-# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
-# With the following limitations:
-# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
-# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
-# * glx platform requires opengl API
-# * wayland, gbm and most other non-glx WSIs require egl platform
-# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
-# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
-# and libpng/jpeg are required for gloverlay element;
-
-# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
-IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
-GL_REQUIRED_USE="
- || ( gbm wayland X )
- wayland? ( egl )
- gbm? ( egl )
-"
-REQUIRED_USE="
- ivorbis? ( ogg )
- theora? ( ogg )
- vorbis? ( ogg )
- opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
- gles2? ( egl ${GL_REQUIRED_USE} )
-"
-
-# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
-# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
-GL_DEPS="
- >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
- egl? (
- x11-libs/libdrm
- )
- gbm? (
- >=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
- >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
- )
- wayland? (
- dev-libs/wayland[${MULTILIB_USEDEP}]
- )
-
- >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
- media-libs/libpng:0[${MULTILIB_USEDEP}]
- virtual/jpeg:0[${MULTILIB_USEDEP}]
-" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
-
-RDEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
- ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
- ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
- orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
- pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
- theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
- vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- )
-
- gles2? ( ${GL_DEPS} )
- opengl? ( ${GL_DEPS} )
-
- !<media-libs/gst-plugins-bad-1.15.0:1.0
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.12
- X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
-)
-
-src_prepare() {
- # Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
- sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
- default
-}
-
-multilib_src_configure() {
- filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
- local myconf=()
- # FIXME: Automagic gbm and x11 wsi
- if use opengl || use gles2; then
- myconf+=(
- --enable-gl
- $(use_enable egl)
- $(use_enable gles2)
- $(use_enable opengl)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- else
- myconf+=(
- --disable-gl
- --disable-egl
- --disable-gles2
- --disable-opengl
- --disable-wayland
- --disable-x11
- )
- fi
-
- if use opengl && use X; then
- # GLX requires desktop OpenGL and X
- myconf+=( --enable-glx )
- else
- myconf+=( --disable-glx )
- fi
-
- myconf+=(
- --disable-cocoa
- --disable-dispmanx
- --disable-wgl
- )
-
- CONFIG_SHELL=${BASH} gstreamer_multilib_src_configure \
- $(use_enable alsa) \
- $(multilib_native_use_enable introspection) \
- $(use_enable ivorbis) \
- $(use_enable ogg) \
- $(use_enable orc) \
- $(use_enable pango) \
- $(use_enable theora) \
- $(use_enable vorbis) \
- $(use_enable X x) \
- $(use_enable X xshm) \
- $(use_enable X xvideo) \
- --enable-iso-codes \
- --enable-zlib \
- --disable-debug \
- --disable-examples \
- --disable-static \
- "${myconf[@]}"
-
- # bug #366931, flag-o-matic for the whole thing is overkill
- if [[ ${CHOST} == *86-*-darwin* ]] ; then
- sed -i \
- -e '/FLAGS = /s|-O[23]|-O1|g' \
- gst/audioconvert/Makefile \
- gst/volume/Makefile || die
- fi
-
- if multilib_is_native_abi; then
- local x
- for x in libs plugins; do
- ln -s "${S}"/docs/${x}/html docs/${x}/html || die
- done
- fi
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS NEWS README RELEASE"
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
- unset GSETTINGS_BACKEND
- emake check
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-base/, media-libs/gst-plugins-base/files/
@ 2021-06-29 16:35 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-06-29 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 3b87d7706edd693335b44919b6d03d40dbb0bd7d
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Tue Jun 29 16:35:01 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 16:35:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b87d770
media-libs/gst-plugins-base: 1.18 backported fixes for >=meson-0.58 and wayland
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gst-plugins-base-1.18.4_meson-0.58.0.patch | 48 +++++++++++++++++++
...ugins-base-1.18.4_wayland_registry_remove.patch | 55 ++++++++++++++++++++++
.../gst-plugins-base-1.18.4.ebuild | 6 +++
3 files changed, 109 insertions(+)
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch
new file mode 100644
index 00000000000..9cb2dafb3d7
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch
@@ -0,0 +1,48 @@
+From 90903917a8185e0f9add7af8153ae2fc9875fdcb Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Mon, 26 Apr 2021 14:25:03 -0400
+Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1
+
+"implicit_include_directories: false" now also means that current build
+directory is not added to include paths by default any more. We have to
+add it manually because we have some custom_target() that generate
+headers in current build directory.
+
+See https://github.com/mesonbuild/meson/issues/8700.
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1127>
+---
+ gst-libs/gst/gl/meson.build | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
+index db11c5e89..731ee9f5e 100644
+--- a/gst-libs/gst/gl/meson.build
++++ b/gst-libs/gst/gl/meson.build
+@@ -989,11 +989,20 @@ if build_gstgl
+ command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@'])
+ gen_sources = [gl_enumtypes_h]
+
++ common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL']
++
++ # We have custom_target() that generate headers in the current build dir,
++ # but with implicit_include_directories: false, meson >= 0.58.0 won't include
++ # it by default. We cannot use include_directories('.') here because it would
++ # also include current source dir which is what we want to avoid because
++ # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h.
++ common_args += '-I@0@'.format(meson.current_build_dir())
++
+ gstgl = library('gstgl-' + api_version,
+ gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h,
+- c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
+- cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
+- objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'],
++ c_args : common_args,
++ cpp_args : common_args,
++ objc_args : common_args + gl_objc_args,
+ include_directories : [configinc, libsinc, gl_includes],
+ version : libversion,
+ soversion : soversion,
+--
+GitLab
+
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch
new file mode 100644
index 00000000000..0bf004350f0
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch
@@ -0,0 +1,55 @@
+From dc1fe07687747f11be6bb0eb944d53efa82ef86c Mon Sep 17 00:00:00 2001
+From: Matthew Waters <matthew@centricular.com>
+Date: Mon, 22 Mar 2021 13:59:39 +1100
+Subject: [PATCH] gl/wayland: provide a dummy global_remove function
+
+Even if we don't care about any global objects being removed, wayland
+will still error if globals are removed without a corresponding listener
+set up for them. e.g. wl_output hotplugging
+
+Discovered by: Matthias Clasen
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1085>
+---
+ .../gst/gl/wayland/gstglwindow_wayland_egl.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
+index 6b06632a7..bb8be2756 100644
+--- a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
++++ b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
+@@ -494,7 +494,8 @@ registry_handle_global (void *data, struct wl_registry *registry,
+ GstGLWindowWaylandEGL *window_wayland = data;
+
+ GST_TRACE_OBJECT (window_wayland, "registry_handle_global with registry %p, "
+- "interface %s, version %u", registry, interface, version);
++ "name %" G_GUINT32_FORMAT ", interface %s, version %u", registry, name,
++ interface, version);
+
+ if (g_strcmp0 (interface, "wl_compositor") == 0) {
+ window_wayland->display.compositor =
+@@ -518,8 +519,20 @@ registry_handle_global (void *data, struct wl_registry *registry,
+ }
+ }
+
++static void
++registry_handle_global_remove (void *data, struct wl_registry *registry,
++ uint32_t name)
++{
++ GstGLWindowWaylandEGL *window_wayland = data;
++
++ /* TODO: deal with any registry objects that may be removed */
++ GST_TRACE_OBJECT (window_wayland, "wl_registry %p global_remove %"
++ G_GUINT32_FORMAT, registry, name);
++}
++
+ static const struct wl_registry_listener registry_listener = {
+- registry_handle_global
++ registry_handle_global,
++ registry_handle_global_remove,
+ };
+
+ static gboolean
+--
+GitLab
+
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
index 0f426cd99d0..a158631adf0 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
@@ -92,6 +92,12 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS NEWS README RELEASE"
+# Fixes backported to 1.18.x, to be removed in 1.18.5
+PATCHES=(
+ "${FILESDIR}/gst-plugins-base-1.18.4_meson-0.58.0.patch"
+ "${FILESDIR}/gst-plugins-base-1.18.4_wayland_registry_remove.patch"
+)
+
multilib_src_configure() {
filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-base/, media-libs/gst-plugins-base/files/
@ 2023-06-09 9:51 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-06-09 9:51 UTC (permalink / raw
To: gentoo-commits
commit: 3a1a9606ca0a32976c8290d7e6309efc4cb88cc6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 09:50:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 09:51:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1a9606
media-libs/gst-plugins-base: backport test (only) fix for glib-2.76
Thanks to Paolo Pedroni for testing. Backport requested upstream but unclear
if there'll be another 1.20.x. Already backported upstream to newer 1.22.x.
Closes: https://bugs.gentoo.org/907415
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gst-plugins-base-1.20.6-libs_allocators.patch | 75 ++++++++++++++++++++++
.../gst-plugins-base-1.20.6.ebuild | 2 +-
2 files changed, 76 insertions(+), 1 deletion(-)
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.20.6-libs_allocators.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.20.6-libs_allocators.patch
new file mode 100644
index 000000000000..44e4c1d388a7
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.20.6-libs_allocators.patch
@@ -0,0 +1,75 @@
+https://bugs.gentoo.org/907415
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2487
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2480
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4422
+
+From a299399f5c93737bf963e34543578dba098b2f50 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Mon, 10 Apr 2023 16:06:19 +0200
+Subject: [PATCH] tests: allocators: Fix fdmem test with recent GLib
+
+The test failed with recent GLib, where `g_close` emits a critical
+warning on EBADF. Remove the `g_close` check from `test_fdmem` and add
+another version that tests `GST_FD_MEMORY_FLAG_DONT_CLOSE`.
+
+We will depend on the Valgrind test run to warn us about leaked FDs.
+
+Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2480
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4422>
+--- a/tests/check/libs/allocators.c
++++ b/tests/check/libs/allocators.c
+@@ -95,7 +95,43 @@ GST_START_TEST (test_fdmem)
+ gst_memory_unmap (mem, &info);
+
+ gst_memory_unref (mem);
+- fail_unless (g_close (fd, NULL) == 0);
++ gst_object_unref (alloc);
++}
++
++GST_END_TEST;
++
++GST_START_TEST (test_fdmem_dont_close)
++{
++ GstAllocator *alloc;
++ GstMemory *mem;
++ GstMapInfo info;
++ GError *error = NULL;
++ int fd;
++ const char *data = "0123456789";
++
++ fd = g_file_open_tmp (NULL, NULL, &error);
++ fail_if (error);
++ fail_unless (write (fd, data, 10) == 10);
++
++ alloc = gst_fd_allocator_new ();
++ fail_unless (alloc);
++ mem = gst_fd_allocator_alloc (alloc, fd, 10,
++ GST_FD_MEMORY_FLAG_KEEP_MAPPED | GST_FD_MEMORY_FLAG_DONT_CLOSE);
++
++ fail_unless (gst_memory_map (mem, &info, GST_MAP_READ));
++ fail_unless (info.data[5] == '5');
++ gst_memory_unmap (mem, &info);
++
++ fail_unless (gst_memory_map (mem, &info, GST_MAP_WRITE));
++ info.data[5] = 'X';
++ gst_memory_unmap (mem, &info);
++
++ fail_unless (gst_memory_map (mem, &info, GST_MAP_READ));
++ fail_unless (info.data[5] == 'X');
++ gst_memory_unmap (mem, &info);
++
++ gst_memory_unref (mem);
++ fail_unless (g_close (fd, NULL));
+ gst_object_unref (alloc);
+ }
+
+@@ -110,6 +146,7 @@ allocators_suite (void)
+ suite_add_tcase (s, tc_chain);
+ tcase_add_test (tc_chain, test_dmabuf);
+ tcase_add_test (tc_chain, test_fdmem);
++ tcase_add_test (tc_chain, test_fdmem_dont_close);
+
+ return s;
+ }
+--
+GitLab
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.20.6.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.20.6.ebuild
index b0cc01a91253..385496ed679e 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.20.6.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.20.6.ebuild
@@ -93,8 +93,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS NEWS README.md RELEASE )
-# Fixes backported to 1.20.1, to be removed in 1.20.2+
PATCHES=(
+ "${FILESDIR}"/${P}-libs_allocators.patch
)
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-09 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-09 9:51 [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-base/, media-libs/gst-plugins-base/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-06-29 16:35 Sam James
2021-02-20 9:42 Mart Raudsepp
2020-03-18 11:22 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox