[SCM] swh-lv2/master: Fix FTBFS on non-Linux archs.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue May 17 11:36:19 UTC 2011


The following commit has been merged in the master branch:
commit 999775fdf86002e23e16032fcd918798522efd90
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 17 13:36:07 2011 +0200

    Fix FTBFS on non-Linux archs.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 005a127..0785cb3 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,10 +1,10 @@
 Description: Adjust installation path.
+ Set OS only if unset.
 Author: Alessio Treglia <alessio at debian.org>
-Forwarded: not-needed
+Forwarded: no
 ---
- Makefile                       |    6 +++---
- plugins/gsm-swh.lv2/plugin.xml |    2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ Makefile |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 --- swh-lv2.orig/Makefile
 +++ swh-lv2/Makefile
@@ -16,6 +16,15 @@ Forwarded: not-needed
  
  VERSION = 1.0.15
  
+@@ -33,7 +33,7 @@ FFT_PLUGINS = mbeq-swh.lv2 pitch_scale-s
+ 
+ 
+ DARWIN := $(shell uname | grep Darwin)
+-OS := $(shell uname -s)
++OS ?= $(shell uname -s)
+ 
+ ifdef DARWIN
+ EXT = so
 @@ -88,7 +88,7 @@ dist-clean:
  real-clean:
  	rm -f plugins/*/*.{c,ttl,$(EXT),o,in} util/*.o gverb/*.o
diff --git a/debian/rules b/debian/rules
index b162089..e46dbd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
 %:
 	dh $@
 

-- 
swh-lv2 packaging



More information about the pkg-multimedia-commits mailing list