Compare commits
No commits in common. "18c08b0f99dd71d8b7fa42416da48a37ddeea304" and "3d2afbea82f5c6058dd9dfc1167e0b7697b147c4" have entirely different histories.
18c08b0f99
...
3d2afbea82
@ -1,38 +0,0 @@
|
|||||||
From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Thu, 12 Mar 2020 14:07:23 +0100
|
|
||||||
Subject: [PATCH] build: 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 fs-enumtypes.c file.
|
|
||||||
|
|
||||||
Spotted by Ernestas Kulik.
|
|
||||||
|
|
||||||
https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4
|
|
||||||
---
|
|
||||||
common-modified/gst-glib-gen.mak | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
|
|
||||||
index 14f1ba37..2247a41c 100644
|
|
||||||
--- a/common-modified/gst-glib-gen.mak
|
|
||||||
+++ b/common-modified/gst-glib-gen.mak
|
|
||||||
@@ -6,7 +6,8 @@
|
|
||||||
#glib_gen_prefix=gst_color_balance
|
|
||||||
#glib_gen_basename=colorbalance
|
|
||||||
|
|
||||||
-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)-enumtypes.h: $(glib_enum_headers)
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
BIN
farstream-0.2.8.tar.gz
Normal file
BIN
farstream-0.2.8.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,16 +1,13 @@
|
|||||||
Name: farstream02
|
Name: farstream02
|
||||||
Version: 0.2.9
|
Version: 0.2.8
|
||||||
Release: 1
|
Release: 3
|
||||||
Summary: Audio/Video Communications Framework
|
Summary: Audio/Video Communications Framework
|
||||||
License: LGPLv2+ and GPLv2+
|
License: LGPLv2+ and GPLv2+
|
||||||
URL: http://www.freedesktop.org/wiki/Software/Farstream
|
URL: http://www.freedesktop.org/wiki/Software/Farstream
|
||||||
Source0: http://freedesktop.org/software/farstream/releases/farstream/farstream-%{version}.tar.gz
|
Source0: http://freedesktop.org/software/farstream/releases/farstream/farstream-%{version}.tar.gz
|
||||||
|
|
||||||
Patch0001: build-Adapt-to-backwards-incompatible-change-in-GNU-Make-4.3.patch
|
BuildRequires: libnice-devel >= 0.1.3 gstreamer1-devel >= 1.0.0 python-devel
|
||||||
|
|
||||||
BuildRequires: libnice-devel >= 0.1.3 gstreamer1-devel >= 1.0.0 python3-devel autoconf
|
|
||||||
BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 gupnp-igd-devel gobject-introspection-devel
|
BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 gupnp-igd-devel gobject-introspection-devel
|
||||||
BuildRequires: gtk-doc
|
|
||||||
Requires: gstreamer1-plugins-good >= 1.0.0 gstreamer1-plugins-bad-free >= 1.0.0 libnice-gstreamer1
|
Requires: gstreamer1-plugins-good >= 1.0.0 gstreamer1-plugins-bad-free >= 1.0.0 libnice-gstreamer1
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -27,10 +24,8 @@ Development files of farstream.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n farstream-%{version} -p1
|
%autosetup -n farstream-%{version} -p1
|
||||||
sed -i 's/-lgstrtp-@GST_API_VERSION@/-lgstrtp-@GST_API_VERSION@ -lm/g' ./tests/rtp/Makefile.am
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf --force --install
|
|
||||||
%configure
|
%configure
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
@ -69,18 +64,5 @@ autoreconf --force --install
|
|||||||
%{_datadir}/gtk-doc/html/farstream-plugins-0.2/
|
%{_datadir}/gtk-doc/html/farstream-plugins-0.2/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jun 21 2022 SimpleUpdate Robot <tc@openeuler.org> - 0.2.9-1
|
|
||||||
- Upgrade to version 0.2.9
|
|
||||||
|
|
||||||
* Tue Jan 11 2022 Ge Wang <wangge20@huawei.com> - 0.2.8-6
|
|
||||||
- Fix build fail due to GNU make version mismatch
|
|
||||||
|
|
||||||
* Tue Oct 27 2020 jialei <jialei17@huawei.com> - 0.2.8-5
|
|
||||||
- change python2 to python3
|
|
||||||
|
|
||||||
* Fri Jul 31 2020 lingsheng <lingsheng@huawei.com> - 0.2.8-4
|
|
||||||
- Fix build fail with make 4.3
|
|
||||||
|
|
||||||
* Thu Apr 23 2020 leiju <leiju4@huawei.com> - 0.2.8-3
|
* Thu Apr 23 2020 leiju <leiju4@huawei.com> - 0.2.8-3
|
||||||
- Package init
|
- Package init
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
version_control: git
|
version_control: gitlab.gnome
|
||||||
src_repo: https://gitlab.freedesktop.org/farstream/farstream.git
|
src_repo: farstream
|
||||||
tag_prefix: ^
|
tag_prefix: ^
|
||||||
separator: .
|
seperator: .
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user