From b3a2d70089f0d0b15a35c9ce3e2631da66879223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 29 Apr 2021 18:07:10 +0200 Subject: [PATCH] Revert "gst-plugins-base: Fix build" This does not work on build hosts with make < 4.3 This reverts commit 2a3f8d01210715047c3005981c49fd42014bf2f9. --- .../0002-Fix-stray.patch | 169 ------------------ .../gst-plugins-base_0.10.36.bb | 1 - 2 files changed, 170 deletions(-) delete mode 100644 recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch diff --git a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch deleted file mode 100644 index 076cc07..0000000 --- a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch +++ /dev/null @@ -1,169 +0,0 @@ -From eaabea6bb8242adb7bdf994b03283e6b627b7e4d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 26 Apr 2021 23:34:33 +0200 -Subject: [PATCH] Fix stray '\' -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - common/glib-gen.mak | 2 +- - common/gst-glib-gen.mak | 2 +- - gst-libs/gst/app/Makefile.in | 2 +- - gst-libs/gst/audio/Makefile.in | 2 +- - gst-libs/gst/interfaces/Makefile.in | 2 +- - gst-libs/gst/pbutils/Makefile.in | 2 +- - gst-libs/gst/rtsp/Makefile.in | 2 +- - gst-libs/gst/video/Makefile.in | 2 +- - gst/encoding/Makefile.in | 2 +- - gst/playback/Makefile.in | 2 +- - gst/tcp/Makefile.in | 2 +- - 11 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/common/glib-gen.mak b/common/glib-gen.mak -index ef93a5f..e43e126 100644 ---- a/common/glib-gen.mak -+++ b/common/glib-gen.mak -@@ -5,7 +5,7 @@ - #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#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 cc82bbd..a18d284 100644 ---- a/common/gst-glib-gen.mak -+++ b/common/gst-glib-gen.mak -@@ -6,7 +6,7 @@ - #glib_gen_prefix=gst_color_balance - #glib_gen_basename=colorbalance - --enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers=$(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - - # these are all the rules generating the relevant files - $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list -diff --git a/gst-libs/gst/app/Makefile.in b/gst-libs/gst/app/Makefile.in -index 8256253..89bbd45 100644 ---- a/gst-libs/gst/app/Makefile.in -+++ b/gst-libs/gst/app/Makefile.in -@@ -513,7 +513,7 @@ lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la - glib_enum_define = GST_APP - glib_gen_prefix = __gst_app - glib_gen_basename = gstapp --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - built_sources = gstapp-marshal.c - built_headers = gstapp-marshal.h - BUILT_SOURCES = $(built_sources) $(built_headers) -diff --git a/gst-libs/gst/audio/Makefile.in b/gst-libs/gst/audio/Makefile.in -index 95c6585..c76a672 100644 ---- a/gst-libs/gst/audio/Makefile.in -+++ b/gst-libs/gst/audio/Makefile.in -@@ -594,7 +594,7 @@ libgstaudio_@GST_MAJORMINOR@_la_LIBADD = \ - $(GST_BASE_LIBS) $(GST_LIBS) - - libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_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#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstaudio_@GST_MAJORMINOR@include_HEADERS)) \ -diff --git a/gst-libs/gst/interfaces/Makefile.in b/gst-libs/gst/interfaces/Makefile.in -index 5a0daff..283322e 100644 ---- a/gst-libs/gst/interfaces/Makefile.in -+++ b/gst-libs/gst/interfaces/Makefile.in -@@ -619,7 +619,7 @@ BUILT_SOURCES = \ - - EXTRA_DIST = interfaces-marshal.list - CLEANFILES = $(BUILT_SOURCES) $(am__append_1) --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstInterfaces-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstinterfacesinclude_HEADERS)) \ -diff --git a/gst-libs/gst/pbutils/Makefile.in b/gst-libs/gst/pbutils/Makefile.in -index 49fae33..103df79 100644 ---- a/gst-libs/gst/pbutils/Makefile.in -+++ b/gst-libs/gst/pbutils/Makefile.in -@@ -608,7 +608,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__append_1) - - # DISTCLEANFILES is for files generated by configure - DISTCLEANFILES = $(built_headers_configure) --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) \ -diff --git a/gst-libs/gst/rtsp/Makefile.in b/gst-libs/gst/rtsp/Makefile.in -index 089b245..edf0328 100644 ---- a/gst-libs/gst/rtsp/Makefile.in -+++ b/gst-libs/gst/rtsp/Makefile.in -@@ -579,7 +579,7 @@ glib_gen_prefix = __gst_rtsp - glib_enum_define = gst_rtsp - glib_enum_headers = gstrtspdefs.h - glib_gen_basename = gstrtsp --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstrtspinclude_HEADERS)) \ -diff --git a/gst-libs/gst/video/Makefile.in b/gst-libs/gst/video/Makefile.in -index ece09b8..f1249d5 100644 ---- a/gst-libs/gst/video/Makefile.in -+++ b/gst-libs/gst/video/Makefile.in -@@ -597,7 +597,7 @@ libgstvideo_@GST_MAJORMINOR@_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#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstvideo_@GST_MAJORMINOR@include_HEADERS)) \ -diff --git a/gst/encoding/Makefile.in b/gst/encoding/Makefile.in -index ef779d3..2957fc9 100644 ---- a/gst/encoding/Makefile.in -+++ b/gst/encoding/Makefile.in -@@ -552,7 +552,7 @@ noinst_HEADERS = \ - BUILT_SOURCES = $(built_headers) $(built_sources) - EXTRA_DIST = gstencode-marshal.list - CLEANFILES = $(BUILT_SOURCES) --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff --git a/gst/playback/Makefile.in b/gst/playback/Makefile.in -index f56b49d..cd9bd4a 100644 ---- a/gst/playback/Makefile.in -+++ b/gst/playback/Makefile.in -@@ -644,7 +644,7 @@ noinst_HEADERS = \ - BUILT_SOURCES = $(built_headers) $(built_sources) - EXTRA_DIST = gstplay-marshal.list - CLEANFILES = $(BUILT_SOURCES) --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff --git a/gst/tcp/Makefile.in b/gst/tcp/Makefile.in -index 65e6408..1f4a879 100644 ---- a/gst/tcp/Makefile.in -+++ b/gst/tcp/Makefile.in -@@ -534,7 +534,7 @@ glib_enum_headers = gsttcp.h - glib_enum_define = GST_TCP - glib_gen_prefix = gst_tcp - glib_gen_basename = gsttcp --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - built_sources = gsttcp-enumtypes.c gsttcp-marshal.c - built_headers = gsttcp-enumtypes.h gsttcp-marshal.h - BUILT_SOURCES = $(built_sources) $(built_headers) --- -2.30.2 - diff --git a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb index 26fc525..8ec304e 100644 --- a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb +++ b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb @@ -12,7 +12,6 @@ SRC_URI += "file://gst-plugins-base-tremor.patch \ file://configure.ac-fix-subparse-plugin.patch \ file://audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch \ file://0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \ - file://0002-Fix-stray.patch \ " SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a"