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-@[email protected] +--- 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-@[email protected] + @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-@[email protected] + @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-@[email protected] + @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-@[email protected] +@@ -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-@[email protected] + @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
