From 75e8f60372aaef51d6d730fe82556f429088a649 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 17 Jul 2008 23:44:13 +0000 Subject: [PATCH] - Update to 1.2 --- .cvsignore | 2 +- rubberband-1.0.1-destdir.patch | 74 ---------------------------------- rubberband-1.0.1-gcc43.patch | 61 ---------------------------- rubberband-1.2-gcc43.patch | 10 +++++ rubberband-1.2-mk.patch | 42 +++++++++++++++++++ rubberband.spec | 14 ++++--- sources | 2 +- 7 files changed, 63 insertions(+), 142 deletions(-) delete mode 100644 rubberband-1.0.1-destdir.patch delete mode 100644 rubberband-1.0.1-gcc43.patch create mode 100644 rubberband-1.2-gcc43.patch create mode 100644 rubberband-1.2-mk.patch diff --git a/.cvsignore b/.cvsignore index 521d3ce..1b365e8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rubberband-1.0.1.tar.bz2 +rubberband-1.2.tar.bz2 diff --git a/rubberband-1.0.1-destdir.patch b/rubberband-1.0.1-destdir.patch deleted file mode 100644 index 7de029e..0000000 --- a/rubberband-1.0.1-destdir.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- rubberband-1.0.1/Makefile.in.destdir 2007-12-13 17:15:03.000000000 -0500 -+++ rubberband-1.0.1/Makefile.in 2008-03-30 23:31:44.000000000 -0400 -@@ -16,16 +16,16 @@ - - PROGRAM_TARGET := bin/rubberband - STATIC_TARGET := lib/librubberband.a --DYNAMIC_TARGET := lib/librubberband$(DYNAMIC_EXTENSION) -+DYNAMIC_TARGET := lib/librubberband$(DYNAMIC_EXTENSION).1 - VAMP_TARGET := lib/vamp-rubberband$(DYNAMIC_EXTENSION) - LADSPA_TARGET := lib/ladspa-rubberband$(DYNAMIC_EXTENSION) - - INSTALL_BINDIR := @prefix@/bin - INSTALL_INCDIR := @prefix@/include/rubberband --INSTALL_LIBDIR := @prefix@/lib --INSTALL_VAMPDIR := @prefix@/lib/vamp --INSTALL_LADSPADIR := @prefix@/lib/ladspa --INSTALL_PKGDIR := @prefix@/lib/pkgconfig -+INSTALL_LIBDIR := @libdir@ -+INSTALL_VAMPDIR := @libdir@/vamp -+INSTALL_LADSPADIR := @libdir@/ladspa -+INSTALL_PKGDIR := @libdir@/pkgconfig - - all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET) - -@@ -95,7 +95,8 @@ - $(AR) rsc $@ $^ - - $(DYNAMIC_TARGET): $(LIBRARY_OBJECTS) -- $(CXX) $(DYNAMIC_LDFLAGS) $^ -o $@ $(LIBRARY_LIBS) $(LDFLAGS) -+ $(CXX) -shared -Wl,-soname,librubberband.so.1 $^ \ -+ -o $@ $(LIBRARY_LIBS) $(LDFLAGS) - - $(VAMP_TARGET): $(LIBRARY_OBJECTS) $(VAMP_OBJECTS) - $(CXX) $(DYNAMIC_LDFLAGS) -o $@ $^ $(VAMP_PLUGIN_LIBS) $(LDFLAGS) -@@ -109,22 +110,24 @@ - $(MKDIR) $@ - - install: all -- $(MKDIR) -p $(INSTALL_BINDIR) -- $(MKDIR) -p $(INSTALL_INCDIR) -- $(MKDIR) -p $(INSTALL_LIBDIR) -- $(MKDIR) -p $(INSTALL_VAMPDIR) -- $(MKDIR) -p $(INSTALL_LADSPADIR) -- $(MKDIR) -p $(INSTALL_PKGDIR) -- cp $(PROGRAM_TARGET) $(INSTALL_BINDIR) -- cp $(PUBLIC_INCLUDES) $(INSTALL_INCDIR) -- cp $(STATIC_TARGET) $(INSTALL_LIBDIR) -- cp $(DYNAMIC_TARGET) $(INSTALL_LIBDIR) -- cp $(VAMP_TARGET) $(INSTALL_VAMPDIR) -- cp src/vamp/vamp-rubberband.cat $(INSTALL_VAMPDIR) -- cp $(LADSPA_TARGET) $(INSTALL_LADSPADIR) -- cp src/ladspa/ladspa-rubberband.cat $(INSTALL_LADSPADIR) -+ $(MKDIR) -p $(DESTDIR)$(INSTALL_BINDIR) -+ $(MKDIR) -p $(DESTDIR)$(INSTALL_INCDIR) -+ $(MKDIR) -p $(DESTDIR)$(INSTALL_LIBDIR) -+ $(MKDIR) -p $(DESTDIR)$(INSTALL_VAMPDIR) -+ $(MKDIR) -p $(DESTDIR)$(INSTALL_LADSPADIR) -+ $(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR) -+ cp -p $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR) -+ cp -p $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR) -+ cp -p $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR) -+ cp -p $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR) -+ ( cd $(DESTDIR)$(INSTALL_LIBDIR) && \ -+ ln -s librubberband.so.1 librubberband.so ) -+ cp -p $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR) -+ cp -p src/vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR) -+ cp -p $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR) -+ cp -p src/ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR) - sed "s,%PREFIX%,@prefix@," rubberband.pc.in \ -- > $(INSTALL_PKGDIR)/rubberband.pc -+ > $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc - - clean: - rm -f $(LIBRARY_OBJECTS) $(PROGRAM_OBJECTS) $(LADSPA_OBJECTS) $(VAMP_OBJECTS) diff --git a/rubberband-1.0.1-gcc43.patch b/rubberband-1.0.1-gcc43.patch deleted file mode 100644 index dc5815d..0000000 --- a/rubberband-1.0.1-gcc43.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- rubberband-1.0.1/src/Window.h.gcc43 2007-12-13 17:15:03.000000000 -0500 -+++ rubberband-1.0.1/src/Window.h 2008-03-30 22:20:04.000000000 -0400 -@@ -16,6 +16,7 @@ - #define _RUBBERBAND_WINDOW_H_ - - #include -+#include - #include - #include - ---- rubberband-1.0.1/src/Thread.cpp.gcc43 2007-12-13 17:15:03.000000000 -0500 -+++ rubberband-1.0.1/src/Thread.cpp 2008-03-30 22:26:25.000000000 -0400 -@@ -14,6 +14,7 @@ - - #include "Thread.h" - -+#include - #include - - #include ---- rubberband-1.0.1/src/FFT.cpp.gcc43 2007-12-13 17:15:03.000000000 -0500 -+++ rubberband-1.0.1/src/FFT.cpp 2008-03-30 22:25:59.000000000 -0400 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - namespace RubberBand { ---- rubberband-1.0.1/src/RingBuffer.h.gcc43 2007-12-13 17:15:03.000000000 -0500 -+++ rubberband-1.0.1/src/RingBuffer.h 2008-03-30 22:25:17.000000000 -0400 -@@ -15,6 +15,7 @@ - #ifndef _RUBBERBAND_RINGBUFFER_H_ - #define _RUBBERBAND_RINGBUFFER_H_ - -+#include - #include - - #ifndef _WIN32 ---- rubberband-1.0.1/src/StretchCalculator.cpp.gcc43 2007-12-13 17:15:03.000000000 -0500 -+++ rubberband-1.0.1/src/StretchCalculator.cpp 2008-03-30 22:21:44.000000000 -0400 -@@ -14,6 +14,7 @@ - - #include "StretchCalculator.h" - -+#include - #include - #include - #include ---- rubberband-1.0.1/src/main.cpp.gcc43 2007-12-13 17:15:03.000000000 -0500 -+++ rubberband-1.0.1/src/main.cpp 2008-03-30 22:26:57.000000000 -0400 -@@ -17,6 +17,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include "sysutils.h" diff --git a/rubberband-1.2-gcc43.patch b/rubberband-1.2-gcc43.patch new file mode 100644 index 0000000..3007681 --- /dev/null +++ b/rubberband-1.2-gcc43.patch @@ -0,0 +1,10 @@ +--- rubberband-1.2/src/sysutils.cpp.gcc43 2008-07-08 11:43:31.000000000 -0400 ++++ rubberband-1.2/src/sysutils.cpp 2008-07-17 18:28:42.000000000 -0400 +@@ -25,6 +25,7 @@ + #endif /* !__APPLE__, !_WIN32 */ + #endif /* !_WIN32 */ + ++#include + #include + + diff --git a/rubberband-1.2-mk.patch b/rubberband-1.2-mk.patch new file mode 100644 index 0000000..a012bdd --- /dev/null +++ b/rubberband-1.2-mk.patch @@ -0,0 +1,42 @@ +--- rubberband-1.2/Makefile.in.mk 2008-07-05 11:22:51.000000000 -0400 ++++ rubberband-1.2/Makefile.in 2008-07-17 18:32:21.000000000 -0400 +@@ -28,11 +28,11 @@ + + INSTALL_BINDIR := @prefix@/bin + INSTALL_INCDIR := @prefix@/include/rubberband +-INSTALL_LIBDIR := @prefix@/lib +-INSTALL_VAMPDIR := @prefix@/lib/vamp +-INSTALL_LADSPADIR := @prefix@/lib/ladspa ++INSTALL_LIBDIR := @libdir@ ++INSTALL_VAMPDIR := @libdir@/vamp ++INSTALL_LADSPADIR := @libdir@/ladspa + INSTALL_LRDFDIR := @prefix@/share/ladspa/rdf +-INSTALL_PKGDIR := @prefix@/lib/pkgconfig ++INSTALL_PKGDIR := @libdir@/pkgconfig + + all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET) + +@@ -138,17 +138,17 @@ + $(MKDIR) -p $(DESTDIR)$(INSTALL_LADSPADIR) + $(MKDIR) -p $(DESTDIR)$(INSTALL_LRDFDIR) + $(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR) +- cp $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR) +- cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR) +- cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR) ++ cp -p $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR) ++ cp -p $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR) ++ cp -p $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR) + rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION) + rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME) +- cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) ++ cp -p $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) + test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION) + test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME) +- cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR) ++ cp -p $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR) + cp src/vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR) +- cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR) ++ cp -p $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR) + cp src/ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR) + cp src/ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR) + sed "s,%PREFIX%,@prefix@," rubberband.pc.in \ diff --git a/rubberband.spec b/rubberband.spec index 7d81ab6..8a0f9a2 100644 --- a/rubberband.spec +++ b/rubberband.spec @@ -1,5 +1,5 @@ Name: rubberband -Version: 1.0.1 +Version: 1.2 Release: 1%{?dist} Summary: Audio time-stretching and pitch-shifting library @@ -7,13 +7,13 @@ Group: System Environment/Libraries License: GPLv2+ URL: http://www.breakfastquay.com/rubberband/ Source0: http://www.breakfastquay.com/rubberband/files/rubberband-%{version}.tar.bz2 -Patch0: rubberband-1.0.1-gcc43.patch -Patch1: rubberband-1.0.1-destdir.patch +Patch0: rubberband-1.2-gcc43.patch +Patch1: rubberband-1.2-mk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fftw-devel libsamplerate-devel libsndfile-devel BuildRequires: ladspa-devel vamp-plugin-sdk-devel -#Requires: +Requires: ladspa %description Rubber Band is a library and utility program that permits you to change the @@ -34,7 +34,7 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .gcc43 -%patch1 -p1 -b .destdir +%patch1 -p1 -b .mk %build @@ -63,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/rubberband %{_libdir}/*.so.* %{_libdir}/ladspa/ladspa-rubberband.* +%{_datadir}/ladspa/rdf/ladspa-rubberband.rdf %{_libdir}/vamp/vamp-rubberband.* %files devel @@ -75,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 17 2008 Michel Alexandre Salim - 1.2-1 +- Update to 1.2 + * Sun Mar 30 2008 Michel Salim - 1.0.1-1 - Initial package diff --git a/sources b/sources index 7eeb6a8..8abe1cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb9524064ae48d6a3af0779590ff4ebc rubberband-1.0.1.tar.bz2 +9092a73906fd56c3e733fd955b802736 rubberband-1.2.tar.bz2