[SCM] rubberband/master: 02-fix_multiarch.patch: Let pkg-config file be ready for multi-arch as well.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Wed Oct 3 09:34:47 UTC 2012
The following commit has been merged in the master branch:
commit 54e0f10dcee262acd50e8983dc13e1a802ace75c
Author: Alessio Treglia <alessio at debian.org>
Date: Wed Oct 3 10:28:52 2012 +0100
02-fix_multiarch.patch: Let pkg-config file be ready for multi-arch as well.
diff --git a/debian/patches/02-fix_multiarch.patch b/debian/patches/02-fix_multiarch.patch
index 689c826..0f41b75 100644
--- a/debian/patches/02-fix_multiarch.patch
+++ b/debian/patches/02-fix_multiarch.patch
@@ -1,12 +1,14 @@
Description: Patch fixing multiarch build
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Forwarded: no
+---
+ Makefile.in | 7 +++++--
+ rubberband.pc.in | 2 +-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
-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 @@
+--- rubberband.orig/Makefile.in
++++ rubberband/Makefile.in
+@@ -3,6 +3,8 @@ CXX := @CXX@
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)
@@ -15,7 +17,7 @@ Index: rubberband/Makefile.in
LIBRARY_LIBS := @SRC_LIBS@ @FFTW_LIBS@
PROGRAM_LIBS := @SNDFILE_LIBS@ $(LIBRARY_LIBS)
-@@ -28,11 +30,11 @@
+@@ -28,11 +30,11 @@ LADSPA_TARGET := lib/ladspa-rubberban
INSTALL_BINDIR := @prefix@/bin
INSTALL_INCDIR := @prefix@/include/rubberband
@@ -29,3 +31,21 @@ Index: rubberband/Makefile.in
all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
+@@ -160,6 +162,7 @@ install: all
+ cp ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
+ sed "s,%PREFIX%, at prefix@," rubberband.pc.in \
+ > $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
++ sed -i "s,%LIBDIR%, at libdir@," $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
+
+ clean:
+ rm -f $(LIBRARY_OBJECTS) $(PROGRAM_OBJECTS) $(LADSPA_OBJECTS) $(VAMP_OBJECTS)
+--- rubberband.orig/rubberband.pc.in
++++ rubberband/rubberband.pc.in
+@@ -1,6 +1,6 @@
+ prefix=%PREFIX%
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${prefix}%LIBDIR%
+ includedir=${prefix}/include
+
+ Name: rubberband
--
rubberband packaging
More information about the pkg-multimedia-commits
mailing list