From 2c7e51cb8317813b29837ce7213dd2b4af9256dc Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 22 Feb 2014 02:53:10 +1100 Subject: package rubberband: remove static patch and enable shared libs --- src/rubberband-1-win32.patch | 77 -------------------------------------------- src/rubberband.mk | 28 ++++++++++++---- 2 files changed, 21 insertions(+), 84 deletions(-) delete mode 100644 src/rubberband-1-win32.patch diff --git a/src/rubberband-1-win32.patch b/src/rubberband-1-win32.patch deleted file mode 100644 index a6033ae..0000000 --- a/src/rubberband-1-win32.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -urN rubberband-1.8.1/configure.ac rubberband-1.8.1-patch/configure.ac ---- rubberband-1.8.1/configure.ac 2012-10-28 12:30:09.000000000 +0200 -+++ rubberband-1.8.1-patch/configure.ac 2014-01-02 09:46:54.000000000 +0200 -@@ -18,7 +18,6 @@ - AC_SUBST(FFTW_CFLAGS) - AC_SUBST(FFTW_LIBS) - --AC_CHECK_HEADERS(ladspa.h) - AC_CHECK_HEADERS(pthread.h) - - PKG_CHECK_MODULES([Vamp],[vamp-sdk]) -diff -urN rubberband-1.8.1/Makefile.in rubberband-1.8.1-patch/Makefile.in ---- rubberband-1.8.1/Makefile.in 2012-10-28 12:30:09.000000000 +0200 -+++ rubberband-1.8.1-patch/Makefile.in 2014-01-02 10:00:14.094909425 +0200 -@@ -12,15 +12,15 @@ - MKDIR := mkdir - AR := ar - --DYNAMIC_EXTENSION := .so --DYNAMIC_FULL_VERSION := .2.1.0 --DYNAMIC_ABI_VERSION := .2 -+DYNAMIC_EXTENSION := .dll -+DYNAMIC_FULL_VERSION := -+DYNAMIC_ABI_VERSION := - DYNAMIC_LIBNAME := librubberband$(DYNAMIC_EXTENSION) - DYNAMIC_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,-soname=$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION) - VAMP_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,--version-script=vamp/vamp-plugin.map - LADSPA_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,--version-script=ladspa/ladspa-plugin.map - --PROGRAM_TARGET := bin/rubberband -+PROGRAM_TARGET := bin/rubberband.exe - STATIC_TARGET := lib/librubberband.a - DYNAMIC_TARGET := lib/$(DYNAMIC_LIBNAME) - VAMP_TARGET := lib/vamp-rubberband$(DYNAMIC_EXTENSION) -@@ -34,7 +34,7 @@ - INSTALL_LRDFDIR := @prefix@/share/ladspa/rdf - INSTALL_PKGDIR := @prefix@/lib/pkgconfig - --all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET) -+all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) - - static: $(STATIC_TARGET) - dynamic: $(DYNAMIC_TARGET) -@@ -137,27 +137,21 @@ - lib: - $(MKDIR) $@ - --install: all -+install: bin lib static program - $(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_LRDFDIR) - $(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR) - cp $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR) - cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR) - cp $(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) -- 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 vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR) -- cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR) -- cp ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR) -- cp ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR) -+ # 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 $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR) -+ # cp vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR) - sed "s,%PREFIX%,@prefix@," rubberband.pc.in \ - > $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc - diff --git a/src/rubberband.mk b/src/rubberband.mk index 5f6bf8a..f022b7f 100644 --- a/src/rubberband.mk +++ b/src/rubberband.mk @@ -8,17 +8,31 @@ $(PKG)_CHECKSUM := ae1faaef211d612db745d66d77266cf6789fd4ee $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://code.breakfastquay.com/attachments/download/34/$(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_DEPS := gcc libsamplerate libsndfile vamp-plugin-sdk pthreads fftw +$(PKG)_DEPS := gcc fftw libsamplerate libsndfile pthreads vamp-plugin-sdk define $(PKG)_UPDATE - echo $($(PKG)_VERSION) + echo 'TODO: Updates for package rubberband need to be written.' >&2; + echo $(rubberband_VERSION) endef define $(PKG)_BUILD - cd '$(1)' && autoreconf -f -i cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -j $(JOBS) -C '$(1)' -j 1 install + $(MXE_CONFIGURE_OPTS) + $(MAKE) -j $(JOBS) -C '$(1)' -j '$(JOBS)' \ + AR='$(TARGET)-ar' \ + RANLIB='$(TARGET)-ranlib' \ + DYNAMIC_EXTENSION='.dll' \ + DYNAMIC_FULL_VERSION= \ + DYNAMIC_ABI_VERSION= \ + lib vamp \ + $(if $(BUILD_STATIC),static,dynamic) + + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/$(PKG)' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/vamp' + $(INSTALL) -m644 '$(1)/$(PKG)/'* '$(PREFIX)/$(TARGET)/include/$(PKG)' + $(INSTALL) -m644 '$(1)/lib/lib$(PKG).$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/lib/vamp-'*.dll '$(PREFIX)/$(TARGET)/lib/vamp' + $(INSTALL) -m644 '$(1)/vamp/vamp-rubberband.cat' '$(PREFIX)/$(TARGET)/lib/vamp' + $(SED) 's,%PREFIX%,$(PREFIX)/$(TARGET),' '$(1)/$(PKG).pc.in' \ + > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc' endef -- cgit v0.12