From cabd784c6efc31a9381cf33968b5310cf12be8bf Mon Sep 17 00:00:00 2001 From: lingsheng Date: Mon, 3 Aug 2020 10:23:46 +0800 Subject: [PATCH] Fix build fail with make 4.3 --- ...kwards-incompatible-change-in-GNU-Make-4.3.patch | 13 +++++++++++++ gstreamer1-plugins-bad-free.spec | 12 +++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 Adapt-to-backwards-incompatible-change-in-GNU-Make-4.3.patch diff --git a/Adapt-to-backwards-incompatible-change-in-GNU-Make-4.3.patch b/Adapt-to-backwards-incompatible-change-in-GNU-Make-4.3.patch new file mode 100644 index 0000000..8b2721f --- /dev/null +++ b/Adapt-to-backwards-incompatible-change-in-GNU-Make-4.3.patch @@ -0,0 +1,13 @@ +diff -Naur gst-plugins-bad-1.14.4/common/gst-glib-gen.mak gst-plugins-bad-1.14.4-fix/common/gst-glib-gen.mak +--- gst-plugins-bad-1.14.4/common/gst-glib-gen.mak 2018-03-24 04:45:17.000000000 +0800 ++++ gst-plugins-bad-1.14.4-fix/common/gst-glib-gen.mak 2020-08-01 18:28:15.096308635 +0800 +@@ -8,7 +8,8 @@ + #glib_gen_decl_banner=GST_EXPORT + #glib_gen_decl_include=\#include + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++hash:=\# ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list diff --git a/gstreamer1-plugins-bad-free.spec b/gstreamer1-plugins-bad-free.spec index 2e1c50e..22e8741 100644 --- a/gstreamer1-plugins-bad-free.spec +++ b/gstreamer1-plugins-bad-free.spec @@ -3,13 +3,15 @@ Name: gstreamer1-plugins-bad-free Version: 1.14.4 -Release: 6 +Release: 7 Summary: Not well tested plugins for GStreamer framework License: LGPLv2+ and LGPLv2 URL: http://gstreamer.freedesktop.org/ Source0: https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz -BuildRequires: gstreamer1-devel >= %{version} gdb +Patch0001: Adapt-to-backwards-incompatible-change-in-GNU-Make-4.3.patch + +BuildRequires: gstreamer1-devel >= %{version} gdb autoconf BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: check gettext-devel libXt-devel gtk-doc BuildRequires: gobject-introspection-devel >= 1.31.1 @@ -75,9 +77,10 @@ Requires: gstreamer1-plugins-base-devel This package provides the development files for GStreamer not-well-tested plugins. %prep -%autosetup -n gst-plugins-bad-%{version} +%autosetup -n gst-plugins-bad-%{version} -p1 %build +autoreconf --force --install %configure --disable-silent-rules --disable-fatal-warnings \ --with-package-name="openEuler GStreamer-plugins-bad package" \ --with-package-origin="https://openeuler.org/en/building/download.html" \ @@ -265,6 +268,9 @@ EOF %{_includedir}/gstreamer-%{majorminor}/gst/* %changelog +* Mon Aug 03 2020 lingsheng - 1.14.4-7 +- Fix build fail with make 4.3 + * Sat Mar 21 2020 songnannan - 1.14.4-6 - bugfix the unpackage file -- Gitee