gentoo Easter resync : 12.04.2020

3 files changed, 63 insertions, 2 deletions

diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index ceee0c3cb453..ea350494c78b 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,3 +1,4 @@
+AUX gst-plugins-good-1.14.5-make43.patch 1869 BLAKE2B 93bf7ca4bfc14461b71dab9a458f86aa79d0fe6c3086f307e70822528e7f91f535760c3d1ba00f86090846b587dcc82a94775f94f2365a3729cd52e093c229d5 SHA512 016c2743025f6a55720238304de54c46931b9e3b3249a49ea5d3980de1d53312afe0150cfd7aa11f8772e3b363aecde2c9afd52df447ab37fe636dec3c196069
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-good-1.14.5.ebuild 1410 BLAKE2B 7327f400c6ff6ec68ffd10e08a328061d3738f84b24631f7f7c429c1d7c57202d58b1f4253b6d3165c4ce98e4dcdcd7377287126fcc38cdd441a2ea471590551 SHA512 de4f38d8534ee28cf0fbf3f7263a26fb795951eac16d7fd59ae0eefe43882e41f6dbe590548426089fd7a4d61d976a844cc6946417856fb1045a4c9a4bf6dc4b
+EBUILD gst-plugins-good-1.14.5.ebuild 1506 BLAKE2B 4f7fa9ec216eba6ba101b8ffdfa9d35151f2c6956bb40fdfbacfc88fe8b800a0cdc5e645fc662f183d41eb569885da7036e5a82cfdb370d15485efc47110c212 SHA512 54bebe46bbede74adcb733677f92f4694cc770edae5cd1e45fe7aa0056cd67e4838a7612215f0ccee160eaa51d274d2fa0a38513cb695805966549d495767b32
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch
new file mode 100644
index 000000000000..2429bf2b0008
--- /dev/null
+++ b/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch
@@ -0,0 +1,56 @@
+--- 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,13 +1,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
+ 
+-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/sys/v4l2/Makefile.in
++++ b/sys/v4l2/Makefile.in
+@@ -17,6 +17,8 @@
+ # 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
+@@ -669,7 +671,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ plugin_LTLIBRARIES = libgstvideo4linux2.la
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ libgstvideo4linux2_la_SOURCES = gstv4l2.c \
+ 				gstv4l2allocator.c \
+ 				gstv4l2colorbalance.c \
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
index 112f1972ea15..cf5aec755cca 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
+)
+
 multilib_src_configure() {
 	# Always enable optional bz2 support for matroska
 	# Always enable optional zlib support for qtdemux and matroska