gentoo resync : 14.05.2020

3 files changed, 224 insertions, 0 deletions

diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index be9058c6699f..800a6cf91a66 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -1,4 +1,7 @@
 AUX gst-plugins-srtp-1.14.5-make43.patch 7675 BLAKE2B e7f57e7a349717b3475715cf5383891ab422ef43143c3532163426a6ebbadcb51d4c339cea3bb646d3251f39f7e2dce3cb93381f5731c17d168a0de4c95b111a SHA512 b1e29b5ad5279043e8c5967d1d4c99613023c7cf7d9f0030bc51765901d4a594f66fceb0f58373ae82c0241fcbdfa3220b40dadbbfd4293137edf003abce677c
+AUX gst-plugins-srtp-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a337eb326e47b9b16fce36938ccfea0b1dbea09213190899843bda338063cfe38589b9badc2676826bcb463cb1c1d90f5dbc19f9 SHA512 ccfd579039d2696e268f7b6fa17930383a765ad472f1e6b5ccc90ee26cbaf9006b584aad3009d8a7882ebbf1533533ae001b4335c781decb0ac93591056c8c30
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
+DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-srtp-1.14.5.ebuild 483 BLAKE2B c1d5a22be1404cf85137d041685c69637591d157fce0b7c0206d0ab28784b1068d393ba85de0adb4ce0b2f0eee8759359ac71c036e26e7775e49730a6b2d257a SHA512 d6c548ae9bc44fb9a2db9faa7398fd42be0122bb0714b7b21af6b689662c65a2486aea0240f4d61d8113952672549ea1ccfe7785b3f7cfca467f298ac2aba455
+EBUILD gst-plugins-srtp-1.16.2.ebuild 489 BLAKE2B 4150e4f1e7dc3edabe8dc7993ffec4df595495d3fdfdc6ca8bc239be36428f36028033cc0bd3d0cacb22b9605cbdcf9498478fa9b2cff13bfee3a682580b4bca SHA512 266069140d66ef5b6a8d6d5b7ada261e7cdc18d846758fbf95504bfaf908d48c5069706ce393230ca443dcec0f429713b8a64b8817bcebeb0353f3c2c3f870c2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/files/gst-plugins-srtp-1.16.2-make43.patch b/media-plugins/gst-plugins-srtp/files/gst-plugins-srtp-1.16.2-make43.patch
new file mode 100644
index 000000000000..f5caac7872d1
--- /dev/null
+++ b/media-plugins/gst-plugins-srtp/files/gst-plugins-srtp-1.16.2-make43.patch
@@ -0,0 +1,200 @@
+diff --git a/common/glib-gen.mak b/common/glib-gen.mak
+index ef93a5f..cc02239 100644
+--- 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
+diff --git a/common/gst-glib-gen.mak b/common/gst-glib-gen.mak
+index 76b2233..5f2b1ed 100644
+--- a/common/gst-glib-gen.mak
++++ b/common/gst-glib-gen.mak
+@@ -1,6 +1,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
+@@ -8,7 +10,7 @@
+ #glib_gen_decl_banner=GST_EXPORT
+ #glib_gen_decl_include=\#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
+diff --git a/ext/srt/Makefile.in b/ext/srt/Makefile.in
+index 09109c3..e5f2a9d 100644
+--- a/ext/srt/Makefile.in
++++ b/ext/srt/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
+@@ -794,7 +796,7 @@ noinst_HEADERS = \
+ 	gstsrtsrc.h \
+ 	$(NULL)
+ 
+-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
+ 
+diff --git a/ext/srtp/Makefile.in b/ext/srtp/Makefile.in
+index 758db8e..017c075 100644
+--- a/ext/srtp/Makefile.in
++++ b/ext/srtp/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
+@@ -775,7 +777,7 @@ glib_gen_basename = gstsrtp
+ 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
+ 
+diff --git a/ext/webrtc/Makefile.in b/ext/webrtc/Makefile.in
+index da8fd9a..ec3588f 100644
+--- a/ext/webrtc/Makefile.in
++++ b/ext/webrtc/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
+@@ -805,7 +807,7 @@ libgstwebrtc_la_LIBADD = \
+ 
+ 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:
+diff --git a/gst-libs/gst/interfaces/Makefile.in b/gst-libs/gst/interfaces/Makefile.in
+index ca1bde5..9d54c2e 100644
+--- a/gst-libs/gst/interfaces/Makefile.in
++++ b/gst-libs/gst/interfaces/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
+@@ -773,7 +775,7 @@ glib_enum_define = GST_PHOTOGRAPHY
+ 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
+ 
+@@ -806,7 +808,7 @@ BUILT_SOURCES = \
+ 	$(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
+ 
+diff --git a/gst-libs/gst/mpegts/Makefile.in b/gst-libs/gst/mpegts/Makefile.in
+index 7a145cb..91a81cc 100644
+--- a/gst-libs/gst/mpegts/Makefile.in
++++ b/gst-libs/gst/mpegts/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
+@@ -822,7 +824,7 @@ glib_enum_define = GST_MPEGTS
+ 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)
+@@ -842,7 +844,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
+ @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
+ 
+diff --git a/gst-libs/gst/webrtc/Makefile.in b/gst-libs/gst/webrtc/Makefile.in
+index 04146bc..1d0db28 100644
+--- a/gst-libs/gst/webrtc/Makefile.in
++++ b/gst-libs/gst/webrtc/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
+@@ -761,7 +763,7 @@ glib_enum_define = GST_WEBRTC
+ 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)
+@@ -807,7 +809,7 @@ libgstwebrtc_@GST_API_VERSION@_la_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 = 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-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
new file mode 100644
index 000000000000..9f9edeb1adf2
--- /dev/null
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-libs/libsrtp-2.1.0:2=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
+)