[arch-commits] Commit in farstream/trunk (PKGBUILD farstream-make-4.3.patch)
Jelle van der Waa
jelle at archlinux.org
Sat May 30 19:08:40 UTC 2020
Date: Saturday, May 30, 2020 @ 19:08:40
Author: jelle
Revision: 387925
Add gitlab patch as it changes over time.
Added:
farstream/trunk/farstream-make-4.3.patch
Modified:
farstream/trunk/PKGBUILD
--------------------------+
PKGBUILD | 8 ++++----
farstream-make-4.3.patch | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-30 18:54:19 UTC (rev 387924)
+++ PKGBUILD 2020-05-30 19:08:40 UTC (rev 387925)
@@ -1,8 +1,8 @@
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer:
pkgname=farstream
pkgver=0.2.9
-pkgrel=1
+pkgrel=2
pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
arch=('x86_64')
url="https://www.freedesktop.org/wiki/Software/Farstream"
@@ -13,10 +13,10 @@
conflicts=('farsight2')
replaces=('farsight2')
source=(https://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}
- farstream-make-4.3.patch::"https://gitlab.freedesktop.org/farstream/farstream/-/commit/54987d44.patch")
+ farstream-make-4.3.patch)
sha256sums=('cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b'
'SKIP'
- '39485c842498c57a0b88ced4897e4ac216426cdd8a8416231513af1513208f5c')
+ '2e7fe73d43c4b1baa5ba0f191aa54c1abb5f72a2bb801d149e7094f4c2c8d0c2')
validpgpkeys=('DB30B086FAF86CE7296FADC51D388E5A4ED9A2BB') # Olivier Crête
prepare() {
Added: farstream-make-4.3.patch
===================================================================
--- farstream-make-4.3.patch (rev 0)
+++ farstream-make-4.3.patch 2020-05-30 19:08:40 UTC (rev 387925)
@@ -0,0 +1,38 @@
+From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at 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.26.2
+
More information about the arch-commits
mailing list