[SCM] rubberband/master: Added patch to fix multiarch build
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Wed Sep 26 10:05:53 UTC 2012
The following commit has been merged in the master branch:
commit 2c9df9428715bbc5a7b105e842dffdf959fa9813
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Wed Sep 26 12:05:22 2012 +0200
Added patch to fix multiarch build
diff --git a/debian/patches/02-fix_multiarch.patch b/debian/patches/02-fix_multiarch.patch
new file mode 100644
index 0000000..689c826
--- /dev/null
+++ b/debian/patches/02-fix_multiarch.patch
@@ -0,0 +1,31 @@
+Description: Patch fixing multiarch build
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: rubberband/Makefile.in
+===================================================================
+--- rubberband.orig/Makefile.in 2012-09-26 11:52:12.177261206 +0200
++++ rubberband/Makefile.in 2012-09-26 11:55:22.366204299 +0200
+@@ -3,6 +3,8 @@
+ CXXFLAGS := -DHAVE_LIBSAMPLERATE -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS -DNO_TIMING -DNDEBUG @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -I. -Isrc $(OPTFLAGS)
+ CFLAGS := @CFLAGS@ $(OPTFLAGS)
+ LDFLAGS := @LDFLAGS@ -lpthread $(LDFLAGS)
++SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
++LIBDIR ?= lib$(SUFFIX)
+
+ LIBRARY_LIBS := @SRC_LIBS@ @FFTW_LIBS@
+ PROGRAM_LIBS := @SNDFILE_LIBS@ $(LIBRARY_LIBS)
+@@ -28,11 +30,11 @@
+
+ INSTALL_BINDIR := @prefix@/bin
+ INSTALL_INCDIR := @prefix@/include/rubberband
+-INSTALL_LIBDIR := @prefix@/lib
++INSTALL_LIBDIR := @prefix@/$(LIBDIR)
+ INSTALL_VAMPDIR := @prefix@/lib/vamp
+ INSTALL_LADSPADIR := @prefix@/lib/ladspa
+ INSTALL_LRDFDIR := @prefix@/share/ladspa/rdf
+-INSTALL_PKGDIR := @prefix@/lib/pkgconfig
++INSTALL_PKGDIR := @prefix@/$(LIBDIR)/pkgconfig
+
+ all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
+
diff --git a/debian/patches/series b/debian/patches/series
index 0d2484a..1af63ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-spelling.patch
+02-fix_multiarch.patch
--
rubberband packaging
More information about the pkg-multimedia-commits
mailing list