!7 Fix build fail with make 4.3
Merge pull request !7 from ultra_planet/master
This commit is contained in:
commit
662ffadfd3
13
Adapt-to-backwards-incompatible-change-in-GNU-Make-4.3.patch
Normal file
13
Adapt-to-backwards-incompatible-change-in-GNU-Make-4.3.patch
Normal file
@ -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 <gst/foo/foo-prelude.h>
|
||||||
|
|
||||||
|
-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
|
||||||
@ -3,13 +3,15 @@
|
|||||||
|
|
||||||
Name: gstreamer1-plugins-bad-free
|
Name: gstreamer1-plugins-bad-free
|
||||||
Version: 1.14.4
|
Version: 1.14.4
|
||||||
Release: 6
|
Release: 7
|
||||||
Summary: Not well tested plugins for GStreamer framework
|
Summary: Not well tested plugins for GStreamer framework
|
||||||
License: LGPLv2+ and LGPLv2
|
License: LGPLv2+ and LGPLv2
|
||||||
URL: http://gstreamer.freedesktop.org/
|
URL: http://gstreamer.freedesktop.org/
|
||||||
Source0: https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
|
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: gstreamer1-plugins-base-devel >= %{version}
|
||||||
BuildRequires: check gettext-devel libXt-devel gtk-doc
|
BuildRequires: check gettext-devel libXt-devel gtk-doc
|
||||||
BuildRequires: gobject-introspection-devel >= 1.31.1
|
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.
|
This package provides the development files for GStreamer not-well-tested plugins.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n gst-plugins-bad-%{version}
|
%autosetup -n gst-plugins-bad-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
autoreconf --force --install
|
||||||
%configure --disable-silent-rules --disable-fatal-warnings \
|
%configure --disable-silent-rules --disable-fatal-warnings \
|
||||||
--with-package-name="openEuler GStreamer-plugins-bad package" \
|
--with-package-name="openEuler GStreamer-plugins-bad package" \
|
||||||
--with-package-origin="https://openeuler.org/en/building/download.html" \
|
--with-package-origin="https://openeuler.org/en/building/download.html" \
|
||||||
@ -265,6 +268,9 @@ EOF
|
|||||||
%{_includedir}/gstreamer-%{majorminor}/gst/*
|
%{_includedir}/gstreamer-%{majorminor}/gst/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 03 2020 lingsheng <lingsheng@huawei.com> - 1.14.4-7
|
||||||
|
- Fix build fail with make 4.3
|
||||||
|
|
||||||
* Sat Mar 21 2020 songnannan <songnannan2@huawei.com> - 1.14.4-6
|
* Sat Mar 21 2020 songnannan <songnannan2@huawei.com> - 1.14.4-6
|
||||||
- bugfix the unpackage file
|
- bugfix the unpackage file
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user