Use patch instead of find&change for fixing header files

3 files changed, 141 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 137ecfaf47bd..ded3fd0d88ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gstreamer0.10-base
 	pkgver = 0.10.36
-	pkgrel = 12
+	pkgrel = 13
 	url = http://gstreamer.freedesktop.org/
 	arch = i686
 	arch = x86_64
@@ -23,12 +23,14 @@ pkgbase = gstreamer0.10-base
 	source = videoscale-fix-negotiation.patch
 	source = ayuv64-lanczos.patch
 	source = gstaudio-symbols.patch
+	source = enum_headers.patch
 	sha256sums = 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a
 	sha256sums = a6a01035ea9627737f9c17f72919857ed43ccc7c2cb08b645b43ed89f78d0f4f
 	sha256sums = 7442c5c68068428b8c7ac1d3825ce29f1bb152b75b77047b9e806c7d322b780c
 	sha256sums = ae27f7be58997217f67898b37b138a485c203389e56b65e6b31c23f769ef39ca
 	sha256sums = 3792dfe80c69f51c0db98533e8fb16707b5dd2ee6933ea6098583af873ceb44a
 	sha256sums = 56e7a988df39d2ec4befa265536ad8c30d3c8d18d136cebef64e8d6baac1abae
+	sha256sums = 0e2a6ef0479621d522c7dbaeb577df3e422c8f7111f5892540f8437475a38932
 
 pkgname = gstreamer0.10-base
 	pkgdesc = GStreamer Multimedia Framework Base plugin libraries
diff --git a/PKGBUILD b/PKGBUILD
index 466eea1d5750..dde44f8ea5ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=gstreamer0.10-base
 _pkgname=gst-plugins-base
 pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
 pkgver=0.10.36
-pkgrel=12
+pkgrel=13
 arch=('i686' 'x86_64' 'armv7h')
 license=('LGPL')
 makedepends=('gstreamer0.10>=0.10.36' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 
@@ -18,13 +18,15 @@ source=("https://gstreamer.freedesktop.org/src/${_pkgname}/${_pkgname}-${pkgver}
         colorbalance-fix-abi.patch
         videoscale-fix-negotiation.patch
         ayuv64-lanczos.patch
-        gstaudio-symbols.patch)
+        gstaudio-symbols.patch
+        enum_headers.patch)
 sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a'
             'a6a01035ea9627737f9c17f72919857ed43ccc7c2cb08b645b43ed89f78d0f4f'
             '7442c5c68068428b8c7ac1d3825ce29f1bb152b75b77047b9e806c7d322b780c'
             'ae27f7be58997217f67898b37b138a485c203389e56b65e6b31c23f769ef39ca'
             '3792dfe80c69f51c0db98533e8fb16707b5dd2ee6933ea6098583af873ceb44a'
-            '56e7a988df39d2ec4befa265536ad8c30d3c8d18d136cebef64e8d6baac1abae')
+            '56e7a988df39d2ec4befa265536ad8c30d3c8d18d136cebef64e8d6baac1abae'
+            '0e2a6ef0479621d522c7dbaeb577df3e422c8f7111f5892540f8437475a38932')
 
 prepare() {
   cd ${_pkgname}-${pkgver}
@@ -34,13 +36,13 @@ prepare() {
   patch -Np1 -i ../ayuv64-lanczos.patch
   patch -Np1 -i ../videoscale-fix-negotiation.patch
   patch -Np1 -i ../gstaudio-symbols.patch
+  patch -Np1 -i ../enum_headers.patch
 }
 
 build() {
   cd ${_pkgname}-${pkgver}
   NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --enable-experimental --disable-gnome_vfs --disable-gtk-doc
-  find . -type f -exec sed -i -e 's/\\#include/#include/g' {} \;
   make
   sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
 }
diff --git a/enum_headers.patch b/enum_headers.patch
new file mode 100644
index 000000000000..1205da241721
--- /dev/null
+++ b/enum_headers.patch
@@ -0,0 +1,132 @@
+diff --unified --recursive --text package.orig/common/glib-gen.mak package.new/common/glib-gen.mak
+--- package.orig/common/glib-gen.mak	2020-03-18 22:16:50.800759634 -0400
++++ package.new/common/glib-gen.mak	2020-03-18 22:17:26.360479044 -0400
+@@ -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 --unified --recursive --text package.orig/common/gst-glib-gen.mak package.new/common/gst-glib-gen.mak
+--- package.orig/common/gst-glib-gen.mak	2020-03-18 22:16:50.800759634 -0400
++++ package.new/common/gst-glib-gen.mak	2020-03-18 22:17:26.360479044 -0400
+@@ -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 --unified --recursive --text package.orig/gst/encoding/Makefile.in package.new/gst/encoding/Makefile.in
+--- package.orig/gst/encoding/Makefile.in	2020-03-18 22:16:50.807426248 -0400
++++ package.new/gst/encoding/Makefile.in	2020-03-18 22:17:26.620476983 -0400
+@@ -493,7 +493,7 @@
+ 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 --unified --recursive --text package.orig/gst/playback/Makefile.in package.new/gst/playback/Makefile.in
+--- package.orig/gst/playback/Makefile.in	2020-03-18 22:16:50.804092941 -0400
++++ package.new/gst/playback/Makefile.in	2020-03-18 22:17:26.540477618 -0400
+@@ -569,7 +569,7 @@
+ 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 --unified --recursive --text package.orig/gst/tcp/Makefile.in package.new/gst/tcp/Makefile.in
+--- package.orig/gst/tcp/Makefile.in	2020-03-18 22:16:50.804092941 -0400
++++ package.new/gst/tcp/Makefile.in	2020-03-18 22:17:26.457144945 -0400
+@@ -471,7 +471,7 @@
+ 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 --unified --recursive --text package.orig/gst-libs/gst/app/Makefile.in package.new/gst-libs/gst/app/Makefile.in
+--- package.orig/gst-libs/gst/app/Makefile.in	2020-03-18 22:16:50.817426170 -0400
++++ package.new/gst-libs/gst/app/Makefile.in	2020-03-18 22:17:27.103806485 -0400
+@@ -473,7 +473,7 @@
+ 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 --unified --recursive --text package.orig/gst-libs/gst/audio/Makefile.in package.new/gst-libs/gst/audio/Makefile.in
+--- package.orig/gst-libs/gst/audio/Makefile.in	2020-03-18 22:16:50.817426170 -0400
++++ package.new/gst-libs/gst/audio/Makefile.in	2020-03-18 22:17:27.070473416 -0400
+@@ -544,7 +544,7 @@
+   $(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 --unified --recursive --text package.orig/gst-libs/gst/interfaces/Makefile.in package.new/gst-libs/gst/interfaces/Makefile.in
+--- package.orig/gst-libs/gst/interfaces/Makefile.in	2020-03-18 22:16:50.814092862 -0400
++++ package.new/gst-libs/gst/interfaces/Makefile.in	2020-03-18 22:17:26.897141457 -0400
+@@ -551,7 +551,7 @@
+ 
+ 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 --unified --recursive --text package.orig/gst-libs/gst/pbutils/Makefile.in package.new/gst-libs/gst/pbutils/Makefile.in
+--- package.orig/gst-libs/gst/pbutils/Makefile.in	2020-03-18 22:16:50.814092862 -0400
++++ package.new/gst-libs/gst/pbutils/Makefile.in	2020-03-18 22:17:26.937141140 -0400
+@@ -542,7 +542,7 @@
+ 
+ # 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 --unified --recursive --text package.orig/gst-libs/gst/rtsp/Makefile.in package.new/gst-libs/gst/rtsp/Makefile.in
+--- package.orig/gst-libs/gst/rtsp/Makefile.in	2020-03-18 22:16:50.817426170 -0400
++++ package.new/gst-libs/gst/rtsp/Makefile.in	2020-03-18 22:17:27.113806406 -0400
+@@ -517,7 +517,7 @@
+ 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 --unified --recursive --text package.orig/gst-libs/gst/video/Makefile.in package.new/gst-libs/gst/video/Makefile.in
+--- package.orig/gst-libs/gst/video/Makefile.in	2020-03-18 22:16:50.810759555 -0400
++++ package.new/gst-libs/gst/video/Makefile.in	2020-03-18 22:17:26.847141854 -0400
+@@ -553,7 +553,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#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)) \