From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- media-libs/gstreamer/Manifest | 3 +- .../gstreamer/files/gstreamer-1.14.5-make43.patch | 84 ++++++++++++++++++++++ media-libs/gstreamer/gstreamer-1.14.5.ebuild | 3 +- 3 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch (limited to 'media-libs/gstreamer') diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest index c8edbcdd35f9..f63421ddb08c 100644 --- a/media-libs/gstreamer/Manifest +++ b/media-libs/gstreamer/Manifest @@ -1,4 +1,5 @@ AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5cbdb2d4fe085fcf77bd798cb474216b758bff3a70f6b0e3f93d656a6e41b44be6c3f931ed5543e4ca10b51d19b4f4f153bc9 SHA512 f559150ac5e40a2fe259a8346ed085a20df86d93e5292c9dcc024274f12e0beb90266395538943946ca01a2a5f56be3ab32f1f850e1c8c047848aebc13ab2350 +AUX gstreamer-1.14.5-make43.patch 3176 BLAKE2B a221894affd68da53d475c65544cfe825b9ab947fb6b7b13c2b409b71f7fcd7224f94835d293d4ea10da9a7cd271284449c97ebd475166fdda6d54929b816e04 SHA512 89de24659fe954e483d62f938b01dc2de25cbcc039eb6c12e8a0dd1681071a567f4799f0cf615738173304e6d103afc2b569fa81cbbbe61bbca1b0a1e849b9bf DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8 -EBUILD gstreamer-1.14.5.ebuild 3463 BLAKE2B a8c7b43c0030c3b9cf0133d8cd4b0aaea1b9a47cc82ebac4515c1cbe6f97dd7102ad3bba0c28f52b8e1169eb942422f586132506a94134041673673602e7dbc0 SHA512 1a81136a9fcfaa2215a743fd37df5ff79227cb24391aee31f34ebccebabcddee1dce935688b82d07644a3ee192198fc1fa2517d491ce44d4a851e561a30e7c67 +EBUILD gstreamer-1.14.5.ebuild 3546 BLAKE2B 425709e719cdb23f49f7936e411a1d06b102109240287d90b8673885b496a1eb32dd51b735e3c03e6b320d5853b2cb1f51794b10f784df043f6e1d279e34f641 SHA512 4ef500bc764dbf072e54ada340bf2429f332d25a9ac57010afb26b13d5dd60afb398678a59d21cccec6e96468a822530782b1f90bebcb4a0b45a119cb25daeca MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57 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 000000000000..e22cc9f8b458 --- /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 ++#glib_gen_decl_include=$(H)include + +-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 +- + + + 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 ++glib_gen_decl_include = $(H)include + 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 ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir + @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 3de3bd8ed033..642bbd7fd66b 100644 --- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild +++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz" LICENSE="LGPL-2+" SLOT="1.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+caps +introspection nls +orc test unwind" RESTRICT="!test? ( test )" @@ -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() { -- cgit v1.2.3