commit 4587c3ffd4c435d72aa103d1de0b0e11a8c8a1e7 Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Fri Apr 24 20:52:51 2020 +0200 fix "error: stray '\' in program" in files generated by glib-mkenums gstreamer-plugins-base-mkenums.patch | 108 +++++++++++++++++++++++++++++++++++ gstreamer-plugins-base.spec | 8 ++- 2 files changed, 115 insertions(+), 1 deletion(-) --- diff --git a/gstreamer-plugins-base-mkenums.patch b/gstreamer-plugins-base-mkenums.patch new file mode 100644 index 0000000..22c5658 --- /dev/null +++ b/gstreamer-plugins-base-mkenums.patch @@ -0,0 +1,108 @@ +diff -up gst-plugins-base-0.10.36/gst/encoding/Makefile.in.mkenums gst-plugins-base-0.10.36/gst/encoding/Makefile.in +--- gst-plugins-base-0.10.36/gst/encoding/Makefile.in.mkenums 2012-02-21 00:33:20.000000000 +0100 ++++ gst-plugins-base-0.10.36/gst/encoding/Makefile.in 2020-04-24 20:44:43.088889646 +0200 +@@ -493,7 +493,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 -up gst-plugins-base-0.10.36/gst-libs/gst/app/Makefile.in.mkenums gst-plugins-base-0.10.36/gst-libs/gst/app/Makefile.in +--- gst-plugins-base-0.10.36/gst-libs/gst/app/Makefile.in.mkenums 2020-04-24 20:40:11.864361078 +0200 ++++ gst-plugins-base-0.10.36/gst-libs/gst/app/Makefile.in 2020-04-24 20:40:11.872361034 +0200 +@@ -473,7 +473,7 @@ lib_LTLIBRARIES = libgstapp-@GST_MAJORMI + 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 -up gst-plugins-base-0.10.36/gst-libs/gst/audio/Makefile.in.mkenums gst-plugins-base-0.10.36/gst-libs/gst/audio/Makefile.in +--- gst-plugins-base-0.10.36/gst-libs/gst/audio/Makefile.in.mkenums 2020-04-24 20:40:11.865361072 +0200 ++++ gst-plugins-base-0.10.36/gst-libs/gst/audio/Makefile.in 2020-04-24 20:40:11.872361034 +0200 +@@ -544,7 +544,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 -up gst-plugins-base-0.10.36/gst-libs/gst/interfaces/Makefile.in.mkenums gst-plugins-base-0.10.36/gst-libs/gst/interfaces/Makefile.in +--- gst-plugins-base-0.10.36/gst-libs/gst/interfaces/Makefile.in.mkenums 2020-04-24 20:40:11.865361072 +0200 ++++ gst-plugins-base-0.10.36/gst-libs/gst/interfaces/Makefile.in 2020-04-24 20:40:11.873361029 +0200 +@@ -551,7 +551,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 -up gst-plugins-base-0.10.36/gst-libs/gst/pbutils/Makefile.in.mkenums gst-plugins-base-0.10.36/gst-libs/gst/pbutils/Makefile.in +--- gst-plugins-base-0.10.36/gst-libs/gst/pbutils/Makefile.in.mkenums 2020-04-24 20:40:11.866361067 +0200 ++++ gst-plugins-base-0.10.36/gst-libs/gst/pbutils/Makefile.in 2020-04-24 20:40:11.873361029 +0200 +@@ -542,7 +542,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__appe + + # 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 -up gst-plugins-base-0.10.36/gst-libs/gst/rtsp/Makefile.in.mkenums gst-plugins-base-0.10.36/gst-libs/gst/rtsp/Makefile.in +--- gst-plugins-base-0.10.36/gst-libs/gst/rtsp/Makefile.in.mkenums 2020-04-24 20:40:11.867361062 +0200 ++++ gst-plugins-base-0.10.36/gst-libs/gst/rtsp/Makefile.in 2020-04-24 20:40:11.874361024 +0200 +@@ -517,7 +517,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 -up gst-plugins-base-0.10.36/gst-libs/gst/video/Makefile.in.mkenums gst-plugins-base-0.10.36/gst-libs/gst/video/Makefile.in +--- gst-plugins-base-0.10.36/gst-libs/gst/video/Makefile.in.mkenums 2020-04-24 20:40:11.868361056 +0200 ++++ gst-plugins-base-0.10.36/gst-libs/gst/video/Makefile.in 2020-04-24 20:40:11.874361024 +0200 +@@ -553,7 +553,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 -up gst-plugins-base-0.10.36/gst/playback/Makefile.in.mkenums gst-plugins-base-0.10.36/gst/playback/Makefile.in +--- gst-plugins-base-0.10.36/gst/playback/Makefile.in.mkenums 2012-02-21 00:33:21.000000000 +0100 ++++ gst-plugins-base-0.10.36/gst/playback/Makefile.in 2020-04-24 20:44:38.134916523 +0200 +@@ -569,7 +569,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 -up gst-plugins-base-0.10.36/gst/tcp/Makefile.in.mkenums gst-plugins-base-0.10.36/gst/tcp/Makefile.in +--- gst-plugins-base-0.10.36/gst/tcp/Makefile.in.mkenums 2012-02-21 00:33:21.000000000 +0100 ++++ gst-plugins-base-0.10.36/gst/tcp/Makefile.in 2020-04-24 20:43:58.153133430 +0200 +@@ -471,7 +471,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) diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index 98d97be..f1ab3d0 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -4,7 +4,7 @@ Name: %{gstreamer}-plugins-base Version: %{gstreamer_version} -Release: 26%{?dist} +Release: 27%{?dist} Summary: GStreamer streaming media framework base plug-ins License: LGPLv2+ @@ -48,6 +48,8 @@ Patch2: 0002-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch Patch3: 0001-typefind-bounds-check-windows-ico-detection.patch Patch4: fix-gst-init.patch Patch5: fix-docs.patch +# Fix error: stray '\' in program +Patch10: %{name}-mkenums.patch %description GStreamer is a streaming media framework, based on graphs of filters which @@ -67,6 +69,7 @@ This package contains a set of well-maintained base plug-ins. %patch3 -p1 -b .0003 %patch4 -p1 -b .0004 %patch5 -p1 -b .0005 +%patch10 -p1 -b .mkenums %build %configure \ @@ -352,6 +355,9 @@ library. %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Fri Apr 24 2020 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net&gt; - 0.10.36-27 +- fix "error: stray '\' in program" in files generated by glib-mkenums + * Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org&gt; - 0.10.36-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild