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
