From b6cd9ea30c66f3fbe4f1db3589ec0aff8c610fb1 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Mar 2020 15:11:15 +0100 Subject: [PATCH] Adapt to backwards incompatible change in GNU Make 4.3 GNU Make 4.3 has a backwards incompatible change affecting the use of number signs or hashes (ie., #) inside function invocations. See: https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html In this case, it would expand the '\#' in the '\n\#include \"$(h)\"' argument to the foreach call to '\#', not '#'. This would lead to spurious backslashes in front of the '#include' directives in the generated gstmpegts-enumtypes.c file. Spotted by Ernestas Kulik. https://gitlab.freedesktop.org/gstreamer/common/-/merge_requests/4 https://bugzilla.redhat.com/show_bug.cgi?id=1799497 --- ...ild-adapt-to-backwards-incompatible-change.patch | 13 +++++++++++++ gstreamer1-plugins-bad-free.spec | 8 ++++++++ 2 files changed, 21 insertions(+) create mode 100644 gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch diff --git a/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch b/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch new file mode 100644 index 0000000..817b842 --- /dev/null +++ b/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch @@ -0,0 +1,13 @@ +diff -urNp gst-plugins-bad-1.16.2.orig/common/gst-glib-gen.mak gst-plugins-bad-1.16.2/common/gst-glib-gen.mak +--- gst-plugins-bad-1.16.2.orig/common/gst-glib-gen.mak 2020-03-20 14:57:08.587740695 +0100 ++++ gst-plugins-bad-1.16.2/common/gst-glib-gen.mak 2020-03-20 15:00:42.584798988 +0100 +@@ -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 c3575f8..0dc2484 100644 --- a/gstreamer1-plugins-bad-free.spec +++ b/gstreamer1-plugins-bad-free.spec @@ -31,9 +31,15 @@ URL: http://gstreamer.freedesktop.org/ Source0: gst-plugins-bad-free-%{version}.tar.xz Source1: gst-p-bad-cleanup.sh +# https://gitlab.freedesktop.org/gstreamer/common/-/merge_requests/4 +# https://bugzilla.redhat.com/show_bug.cgi?id=1799497 +Patch0: gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch + BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} +BuildRequires: autoconf +BuildRequires: automake BuildRequires: check BuildRequires: gettext-devel BuildRequires: libXt-devel @@ -189,9 +195,11 @@ aren't tested well enough, or the code is not of good enough quality. %prep %setup -q -n gst-plugins-bad-%{version} +%patch0 -p1 %build +autoreconf --force --install %configure --disable-silent-rules --disable-fatal-warnings \ --with-package-name="Fedora GStreamer-plugins-bad package" \ --with-package-origin="http://download.fedoraproject.org" \