commit: d26d94695c46be522bea60762c7f4a0a47e6778b Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Wed Mar 18 11:22:10 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Mar 18 11:22:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26d9469
media-libs/gstreamer: 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> .../gstreamer/files/gstreamer-1.14.5-make43.patch | 84 ++++++++++++++++++++++ media-libs/gstreamer/gstreamer-1.14.5.ebuild | 1 + 2 files changed, 85 insertions(+) diff --git a/media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch b/media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch new file mode 100644 index 00000000000..e22cc9f8b45 --- /dev/null +++ b/media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch @@ -0,0 +1,84 @@ +--- 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/libs/gst/controller/Makefile.in ++++ b/libs/gst/controller/Makefile.in +@@ -17,13 +17,6 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + +-#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> +- + + + VPATH = @srcdir@ +@@ -550,11 +543,12 @@ + gstinterpolationcontrolsource.h \ + gstlfocontrolsource.h + ++H := \# + glib_enum_define = GST_CONTROLLER + glib_gen_prefix = gst + glib_gen_basename = controller + glib_gen_decl_banner = GST_CONTROLLER_API +-glib_gen_decl_include = \#include <gst/controller/controller-prelude.h> ++glib_gen_decl_include = $(H)include <gst/controller/controller-prelude.h> + built_sources = controller-enumtypes.c + built_headers = controller-enumtypes.h + BUILT_SOURCES = $(built_sources) $(built_headers) +@@ -587,7 +581,14 @@ + libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM) + libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) + CLEANFILES = *.gcno *.gcda *.gcov $(BUILT_SOURCES) $(am__append_1) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(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=$(H)include <gst/foo/foo-prelude.h> ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstController-@[email protected] + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstcontroller_@GST_API_VERSION@_include_HEADERS)) \ diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild index 3de3bd8ed03..d1e6df24377 100644 --- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild +++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild @@ -37,6 +37,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/1.14-glib-2.60-tests-compat.patch + "${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson ) src_configure() {
