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-plugins/gst-plugins-srtp/Manifest | 3 +- .../files/gst-plugins-srtp-1.14.5-make43.patch | 226 +++++++++++++++++++++ .../gst-plugins-srtp-1.14.5.ebuild | 6 +- 3 files changed, 233 insertions(+), 2 deletions(-) create mode 100644 media-plugins/gst-plugins-srtp/files/gst-plugins-srtp-1.14.5-make43.patch (limited to 'media-plugins/gst-plugins-srtp') diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest index 5f6613be1592..be9058c6699f 100644 --- a/media-plugins/gst-plugins-srtp/Manifest +++ b/media-plugins/gst-plugins-srtp/Manifest @@ -1,3 +1,4 @@ +AUX gst-plugins-srtp-1.14.5-make43.patch 7675 BLAKE2B e7f57e7a349717b3475715cf5383891ab422ef43143c3532163426a6ebbadcb51d4c339cea3bb646d3251f39f7e2dce3cb93381f5731c17d168a0de4c95b111a SHA512 b1e29b5ad5279043e8c5967d1d4c99613023c7cf7d9f0030bc51765901d4a594f66fceb0f58373ae82c0241fcbdfa3220b40dadbbfd4293137edf003abce677c DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b -EBUILD gst-plugins-srtp-1.14.5.ebuild 383 BLAKE2B 65695182397f10881db9686f8f20d9adf58823c1e321a93b6a2d92256b8f111789709286f8bad7f2eb95691fa9ab6ae28edac3173c59d59e7aff3629923191af SHA512 e7a6a46de63b6d4afd3bbc6cf8027d7cba90c70f543c484c96be5a785bab2af5d3e032d7d672d746796c13baaef7c39022f71d2b28542d3c1cae21c9938e70c6 +EBUILD gst-plugins-srtp-1.14.5.ebuild 483 BLAKE2B c1d5a22be1404cf85137d041685c69637591d157fce0b7c0206d0ab28784b1068d393ba85de0adb4ce0b2f0eee8759359ac71c036e26e7775e49730a6b2d257a SHA512 d6c548ae9bc44fb9a2db9faa7398fd42be0122bb0714b7b21af6b689662c65a2486aea0240f4d61d8113952672549ea1ccfe7785b3f7cfca467f298ac2aba455 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0 diff --git a/media-plugins/gst-plugins-srtp/files/gst-plugins-srtp-1.14.5-make43.patch b/media-plugins/gst-plugins-srtp/files/gst-plugins-srtp-1.14.5-make43.patch new file mode 100644 index 000000000000..2779516250b7 --- /dev/null +++ b/media-plugins/gst-plugins-srtp/files/gst-plugins-srtp-1.14.5-make43.patch @@ -0,0 +1,226 @@ +--- 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,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 + +-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/ext/srt/Makefile.in ++++ b/ext/srt/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 ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -795,7 +797,7 @@ + gstsrtserversink.h \ + $(NULL) + +-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/ext/srtp/Makefile.in ++++ b/ext/srtp/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 ++#glib_gen_decl_include=$(H)include + + VPATH = @srcdir@ + am__is_gnu_make = { \ +@@ -775,7 +777,7 @@ + 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 + +--- a/ext/webrtc/Makefile.in ++++ b/ext/webrtc/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 ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -797,7 +799,7 @@ + + 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: +--- a/gst-libs/gst/interfaces/Makefile.in ++++ b/gst-libs/gst/interfaces/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 ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -773,7 +775,7 @@ + glib_gen_prefix = gst_photography + glib_gen_basename = photography + glib_gen_decl_banner = GST_PHOTOGRAPHY_API +-glib_gen_decl_include = \#include ++glib_gen_decl_include=$(H)include + built_sources = \ + photography-enumtypes.c + +@@ -805,7 +807,7 @@ + $(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 + +--- a/gst-libs/gst/mpegts/Makefile.in ++++ b/gst-libs/gst/mpegts/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 ++#glib_gen_decl_include=$(H)include + + + +@@ -821,7 +823,7 @@ + glib_gen_prefix = gst_mpegts + glib_gen_basename = gstmpegts + glib_gen_decl_banner = GST_MPEGTS_API +-glib_gen_decl_include = \#include ++glib_gen_decl_include=$(H)include + BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h + nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c + CLEANFILES = $(BUILT_SOURCES) $(am__append_1) +@@ -841,7 +843,7 @@ + @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 + +--- a/gst-libs/gst/webrtc/Makefile.in ++++ b/gst-libs/gst/webrtc/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 ++#glib_gen_decl_include=$(H)include + + + +@@ -761,7 +763,7 @@ + glib_gen_prefix = gst_webrtc + glib_gen_basename = webrtc + glib_gen_decl_banner = GST_WEBRTC_API +-glib_gen_decl_include = \#include ++glib_gen_decl_include=$(H)include + built_sources = webrtc-enumtypes.c + built_headers = webrtc-enumtypes.h + BUILT_SOURCES = $(built_sources) $(built_headers) +@@ -806,7 +808,7 @@ + $(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.14.5.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild index 2b2de83b219b..5dedd51f42dc 100644 --- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild +++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild @@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad inherit gstreamer DESCRIPTION="SRTP encoder/decoder plugin for GStreamer" -KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86" IUSE="" RDEPEND=" @@ -15,3 +15,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-util/glib-utils" + +PATCHES=( + "${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson +) -- cgit v1.2.3