farstream: 0.2.8 -> 0.2.9

4 files changed, 55 insertions, 13 deletions

diff --git a/farstream/.footprint b/farstream/.footprint
index 8f6b9bc42..bdda537b6 100644
--- a/farstream/.footprint
+++ b/farstream/.footprint
@@ -28,8 +28,6 @@ drwxr-xr-x	root/root	usr/lib/farstream-0.2/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Farstream-0.2.typelib
 drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libfsmsnconference.la
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libfsmsnconference.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libfsrawconference.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libfsrawconference.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libfsrtpconference.la
@@ -39,9 +37,9 @@ drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libfsvideoanyrate.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libfsvideoanyrate.so
 -rwxr-xr-x	root/root	usr/lib/libfarstream-0.2.la
-lrwxrwxrwx	root/root	usr/lib/libfarstream-0.2.so -> libfarstream-0.2.so.5.1.0
-lrwxrwxrwx	root/root	usr/lib/libfarstream-0.2.so.5 -> libfarstream-0.2.so.5.1.0
--rwxr-xr-x	root/root	usr/lib/libfarstream-0.2.so.5.1.0
+lrwxrwxrwx	root/root	usr/lib/libfarstream-0.2.so -> libfarstream-0.2.so.5.1.1
+lrwxrwxrwx	root/root	usr/lib/libfarstream-0.2.so.5 -> libfarstream-0.2.so.5.1.1
+-rwxr-xr-x	root/root	usr/lib/libfarstream-0.2.so.5.1.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/farstream-0.2.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/farstream/.signature b/farstream/.signature
index fbd94a8e3..e607f3d5b 100644
--- a/farstream/.signature
+++ b/farstream/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/FGlyOUEdtX8b21b0abbkcPtjyqLiYOACYcTHdfmpvTC47GCqWv7JC2qNAv0TOerhRDXNPLGVmd42lCQIFx6AI=
-SHA256 (Pkgfile) = 1a8e1dcb4dcfcd18415c0b07d3e24c6bcc1feecbe7e02c2fb0f2a946e51f3ed0
-SHA256 (.footprint) = b4b204df236e88d21860fd0d2aaa8e9ccd43048ea024b842d40eb7796de49bc1
-SHA256 (farstream-0.2.8.tar.gz) = 2b3b9c6b4f64ace8c83e03d1da5c5a2884c1cae10b35471072b574201ab38908
+RWSagIOpLGJF30Z9WYIwC8LUUrdA6AedPn9ouIgWwl6qC1h4q2jtPt/1l5xNThus3GTtSvrCt/VvA/9iIXwSVWc18PUx5EbKHwU=
+SHA256 (Pkgfile) = 8488d5f7475ab373d27f6cea7ddfbd094e41c33e85dd4b964043a29856c60bd8
+SHA256 (.footprint) = d7641957005955e83650f778061f666793865ad675f05eb9aa60067a02e1ba97
+SHA256 (farstream-0.2.9.tar.gz) = cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b
+SHA256 (farstream-make-4.3.patch) = 39485c842498c57a0b88ced4897e4ac216426cdd8a8416231513af1513208f5c
diff --git a/farstream/Pkgfile b/farstream/Pkgfile
index 29efcdabb..d37be6f54 100644
--- a/farstream/Pkgfile
+++ b/farstream/Pkgfile
@@ -6,21 +6,26 @@
 # Optional: gst-plugins-bad gst-plugins-good
 
 name=farstream
-version=0.2.8
+version=0.2.9
 release=1
-source=(http://freedesktop.org/software/$name/releases/$name/$name-$version.tar.gz)
+source=(https://freedesktop.org/software/$name/releases/$name/$name-$version.tar.gz
+	farstream-make-4.3.patch)
 
 build() {
 	cd $name-$version
 
+	patch -p1 -i $SRC/farstream-make-4.3.patch
+	./autogen.sh --disable-gtk-doc
+
 	./configure \
 		--prefix=/usr \
 		--with-package-name='CRUX Linux farstream package' \
-		--with-package-origin='http://crux.nu'
+		--with-package-origin='http://crux.nu' \
+		--disable-gtk-doc
 
 	make
 	make DESTDIR=$PKG install
 
 	# gtk-doc is still generated!
-	rm -rf $PKG/usr/share/gtk-doc
+	rm -r $PKG/usr/share/gtk-doc
 }
diff --git a/farstream/farstream-make-4.3.patch b/farstream/farstream-make-4.3.patch
new file mode 100644
index 000000000..ebab82382
--- /dev/null
+++ b/farstream/farstream-make-4.3.patch
@@ -0,0 +1,38 @@
+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)
+-- 
+2.24.1
+