From: Jan Palus Date: Mon, 18 May 2020 09:23:08 +0000 (+0200) Subject: fix build with new make X-Git-Tag: auto/th/gstreamer0.10-plugins-bad-0.10.23-34~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=01c95afdf7077620d312b2cc79174ac323862bd0;p=packages%2Fgstreamer0.10-plugins-bad.git fix build with new make --- diff --git a/gstreamer0.10-plugins-bad.spec b/gstreamer0.10-plugins-bad.spec index cc59276..8cedb51 100644 --- a/gstreamer0.10-plugins-bad.spec +++ b/gstreamer0.10-plugins-bad.spec @@ -52,6 +52,7 @@ Patch11: gstreamer-common-gtkdoc.patch Patch12: gstreamer-plugins-bad-orc.patch Patch13: openssl.patch Patch14: doc.patch +Patch15: make43.patch URL: http://gstreamer.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1:1.10 @@ -898,6 +899,7 @@ cd common cd .. %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build %{__libtoolize} diff --git a/make43.patch b/make43.patch new file mode 100644 index 0000000..6f5e3b1 --- /dev/null +++ b/make43.patch @@ -0,0 +1,26 @@ +diff -urN gst-plugins-bad-0.10.23.orig/common/glib-gen.mak gst-plugins-bad-0.10.23/common/glib-gen.mak +--- gst-plugins-bad-0.10.23.orig/common/glib-gen.mak 2011-12-11 20:19:22.000000000 +0100 ++++ gst-plugins-bad-0.10.23/common/glib-gen.mak 2020-05-18 11:18:40.781868402 +0200 +@@ -5,7 +5,8 @@ + #glib_enum_define=GST_COLOR_BALANCE + #glib_enum_prefix=gst_color_balance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++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 -urN gst-plugins-bad-0.10.23.orig/common/gst-glib-gen.mak gst-plugins-bad-0.10.23/common/gst-glib-gen.mak +--- gst-plugins-bad-0.10.23.orig/common/gst-glib-gen.mak 2011-12-11 20:19:22.000000000 +0100 ++++ gst-plugins-bad-0.10.23/common/gst-glib-gen.mak 2020-05-18 11:18:54.668481255 +0200 +@@ -6,7 +6,8 @@ + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++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