[SCM] rubberband/master: Refreshed patch

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Mon Dec 10 03:30:21 UTC 2012


The following commit has been merged in the master branch:
commit 9aea4d27fad6fcbb2907accb6318f747590d330d
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Dec 10 04:30:48 2012 +0100

    Refreshed patch

diff --git a/debian/patches/02-fix_multiarch.patch b/debian/patches/02-fix_multiarch.patch
index 0f41b75..58f27d8 100644
--- a/debian/patches/02-fix_multiarch.patch
+++ b/debian/patches/02-fix_multiarch.patch
@@ -6,10 +6,12 @@ Forwarded: no
  rubberband.pc.in |    2 +-
  2 files changed, 6 insertions(+), 3 deletions(-)
 
---- 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)
+Index: rubberband/Makefile.in
+===================================================================
+--- rubberband.orig/Makefile.in	2012-12-10 04:09:09.975302197 +0100
++++ rubberband/Makefile.in	2012-12-10 04:22:30.247334737 +0100
+@@ -3,6 +3,8 @@
+ CXXFLAGS	:= -DHAVE_LIBSAMPLERATE -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS -DUSE_PTHREADS -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/')
@@ -17,7 +19,7 @@ Forwarded: no
  
  LIBRARY_LIBS		:= @SRC_LIBS@ @FFTW_LIBS@ 
  PROGRAM_LIBS		:= @SNDFILE_LIBS@ $(LIBRARY_LIBS)
-@@ -28,11 +30,11 @@ LADSPA_TARGET  		:= lib/ladspa-rubberban
+@@ -28,11 +30,11 @@
  
  INSTALL_BINDIR		:= @prefix@/bin
  INSTALL_INCDIR		:= @prefix@/include/rubberband
@@ -31,7 +33,7 @@ Forwarded: no
  
  all:	bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
  
-@@ -160,6 +162,7 @@ install:	all
+@@ -160,6 +162,7 @@
  	cp ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
  	sed "s,%PREFIX%, at prefix@," rubberband.pc.in \
  	  > $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
@@ -39,8 +41,10 @@ Forwarded: no
  
  clean:
  	rm -f $(LIBRARY_OBJECTS) $(PROGRAM_OBJECTS) $(LADSPA_OBJECTS) $(VAMP_OBJECTS)
---- rubberband.orig/rubberband.pc.in
-+++ rubberband/rubberband.pc.in
+Index: rubberband/rubberband.pc.in
+===================================================================
+--- rubberband.orig/rubberband.pc.in	2012-12-10 04:09:09.979302197 +0100
++++ rubberband/rubberband.pc.in	2012-12-10 04:22:30.247334737 +0100
 @@ -1,6 +1,6 @@
  prefix=%PREFIX%
  exec_prefix=${prefix}

-- 
rubberband packaging



More information about the pkg-multimedia-commits mailing list