commit 5ce76e18dd068302a1cc9dfc6254416de9abbc84
Author: Jan Palus <[email protected]>
Date: Fri May 8 00:10:17 2020 +0200
up to 0.2.9
- fix build with new make (inspired by gentoo patch)
farstream-make.patch | 32 ++++++++++++++++++++++++++++++++
farstream.spec | 7 ++++---
2 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/farstream.spec b/farstream.spec
index 21e93f8..59f5637 100644
--- a/farstream.spec
+++ b/farstream.spec
@@ -6,12 +6,13 @@
Summary: Audio/Video Communications Framework
Summary(pl.UTF-8): Szkielet komunikacji Audio/Video
Name: farstream
-Version: 0.2.8
+Version: 0.2.9
Release: 1
License: LGPL v2+
Group: Libraries
Source0:
http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{version}.tar.gz
-# Source0-md5: a40d4c4bd0812c270069b9f97d74009b
+# Source0-md5: 35ad6b9e0fb52debeaa2d5194bf5153c
+Patch0: %{name}-make.patch
URL: https://www.freedesktop.org/wiki/Software/Farstream
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -106,6 +107,7 @@ Dokumentacja API biblioteki Farstream.
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
@@ -146,7 +148,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/farstream-0.2/libnice-transmitter.so
%attr(755,root,root) %{_libdir}/farstream-0.2/librawudp-transmitter.so
%attr(755,root,root) %{_libdir}/farstream-0.2/libshm-transmitter.so
-%attr(755,root,root) %{_libdir}/gstreamer-1.0/libfsmsnconference.so
%attr(755,root,root) %{_libdir}/gstreamer-1.0/libfsrawconference.so
%attr(755,root,root) %{_libdir}/gstreamer-1.0/libfsrtpconference.so
%attr(755,root,root) %{_libdir}/gstreamer-1.0/libfsrtpxdata.so
diff --git a/farstream-make.patch b/farstream-make.patch
new file mode 100644
index 0000000..6dffd08
--- /dev/null
+++ b/farstream-make.patch
@@ -0,0 +1,32 @@
+diff -urN farstream-0.2.9.orig/common-modified/gst-glib-gen.mak
farstream-0.2.9/common-modified/gst-glib-gen.mak
+--- farstream-0.2.9.orig/common-modified/gst-glib-gen.mak 2020-03-11
22:05:08.000000000 +0100
++++ farstream-0.2.9/common-modified/gst-glib-gen.mak 2020-05-07
23:11:59.220472664 +0200
+@@ -6,7 +6,9 @@
+ #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)-enumtypes.h: $(glib_enum_headers)
+diff -urN farstream-0.2.9.orig/farstream/Makefile.am
farstream-0.2.9/farstream/Makefile.am
+--- farstream-0.2.9.orig/farstream/Makefile.am 2020-03-11 22:05:08.000000000
+0100
++++ farstream-0.2.9/farstream/Makefile.am 2020-05-07 23:11:39.790549784
+0200
+@@ -69,11 +69,13 @@
+ fs-conference.h \
+ fs-utils.h
+
++H := \#
++
+ glib_enum_headers=$(public_headers)
+ glib_enum_define=FS
+ glib_gen_prefix=_fs
+ glib_gen_basename=fs
+-glib_gen_decl_include=\#include <glib-object.h>
++glib_gen_decl_include=$(H)include <glib-object.h>
+
+ include $(top_srcdir)/common-modified/gst-glib-gen.mak
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/farstream.git/commitdiff/5ce76e18dd068302a1cc9dfc6254416de9abbc84
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
