Patches/rubberband.patch

   1 --- Makefile.osx.orig   2014-04-19 17:43:23.000000000 +0100
   2 +++ Makefile.osx        2014-04-19 17:44:21.000000000 +0100
   3 @@ -1,28 +1,28 @@
   4
   5  CXX            := g++
   6  CC             := gcc
   7 -ARCHFLAGS      :=
   8 +ARCHFLAGS      := -isysroot /Users/carl/SDK/MacOSX10.7.sdk -I$$CBS_ROOT/include -L$$CBS_ROOT/lib
   9  OPTFLAGS       := -DNDEBUG -ffast-math -mfpmath=sse -msse -msse2 -O3 -ftree-vectorize
  10
  11 -CXXFLAGS       := $(ARCHFLAGS) $(OPTFLAGS) -I/usr/local/include -DUSE_PTHREADS -DMALLOC_IS_ALIGNED -DHAVE_VDSP -DUSE_SPEEX -DNO_THREAD_CHECKS -DNO_TIMING -Irubberband -I. -Isrc
  12 +CXXFLAGS       := $(ARCHFLAGS) $(OPTFLAGS) -DUSE_PTHREADS -DMALLOC_IS_ALIGNED -DHAVE_VDSP -DUSE_SPEEX -DNO_THREAD_CHECKS -DNO_TIMING -Irubberband -I. -Isrc
  13
  14  LIBRARY_LIBS           := -framework Accelerate
  15
  16  CFLAGS         := $(ARCHFLAGS) $(OPTFLAGS)
  17 -LDFLAGS                := $(ARCHFLAGS) -lpthread $(LDFLAGS)
  18 +LDFLAGS                := $(ARCHFLAGS) -lpthread $(LDFLAGS) -lfftw3 -lsamplerate -lc++
  19
  20 -PROGRAM_LIBS           := -L/usr/local/lib -lsndfile $(LIBRARY_LIBS)
  21 -VAMP_PLUGIN_LIBS       := -L/usr/local/lib -lvamp-sdk $(LIBRARY_LIBS)
  22 +PROGRAM_LIBS           := -lsndfile $(LIBRARY_LIBS)
  23 +VAMP_PLUGIN_LIBS       := -lvamp-sdk $(LIBRARY_LIBS)
  24  LADSPA_PLUGIN_LIBS     := $(LIBRARY_LIBS)
  25
  26  MKDIR                  := mkdir
  27  AR                     := ar
  28
  29 -DYNAMIC_LDFLAGS                := -dynamiclib
  30 +DYNAMIC_LDFLAGS                := -dynamiclib -shared
  31  DYNAMIC_EXTENSION      := .dylib
  32
  33  PROGRAM_TARGET                 := bin/rubberband
  34 -STATIC_TARGET                  := lib/librubberband.a
  35 +STATIC_TARGET                  := librubberband.a
  36  DYNAMIC_TARGET                 := lib/librubberband$(DYNAMIC_EXTENSION)
  37  VAMP_TARGET                    := lib/vamp-rubberband$(DYNAMIC_EXTENSION)
  38  LADSPA_TARGET                  := lib/ladspa-rubberband$(DYNAMIC_EXTENSION)
  39 @@ -130,10 +130,10 @@
  40         $(CXX) $(DYNAMIC_LDFLAGS) $^ -o $@ $(LIBRARY_LIBS) $(LDFLAGS)
  41
  42  $(VAMP_TARGET):                $(LIBRARY_OBJECTS) $(VAMP_OBJECTS)
  43 -       $(CXX) $(VAMP_LDFLAGS) -o $@ $^ $(VAMP_PLUGIN_LIBS) $(LDFLAGS)
  44 +       $(CXX) $(DYNAMIC_LDFLAGS) -o $@ $^ $(VAMP_PLUGIN_LIBS) $(LDFLAGS)
  45
  46  $(LADSPA_TARGET):      $(LIBRARY_OBJECTS) $(LADSPA_OBJECTS)
  47 -       $(CXX) $(LADSPA_LDFLAGS) -o $@ $^ $(LADSPA_PLUGIN_LIBS) $(LDFLAGS)
  48 +       $(CXX) $(DYNAMIC_LDFLAGS) -o $@ $^ $(LADSPA_PLUGIN_LIBS) $(LDFLAGS)
  49
  50  bin:
  51         $(MKDIR) $@
  52 @@ -149,7 +149,33 @@
  53  depend:
  54         makedepend -Y $(LIBRARY_SOURCES) $(PROGRAM_SOURCES)
  55
  56 -
  57 +INSTALL_BINDIR         := $$CBS_ROOT/bin
  58 +INSTALL_INCDIR         := $$CBS_ROOT/include/rubberband
  59 +INSTALL_LIBDIR         := $$CBS_ROOT/lib
  60 +INSTALL_VAMPDIR                := $$CBS_ROOT/lib/vamp
  61 +INSTALL_LADSPADIR      := $$CBS_ROOT/lib/ladspa
  62 +INSTALL_LRDFDIR                := $$CBS_ROOT/share/ladspa/rdf
  63 +INSTALL_PKGDIR         := $$CBS_ROOT/lib/pkgconfig
  64 +
  65 +install:       all
  66 +       $(MKDIR) -p $(DESTDIR)$(INSTALL_BINDIR)
  67 +       $(MKDIR) -p $(DESTDIR)$(INSTALL_INCDIR)
  68 +       $(MKDIR) -p $(DESTDIR)$(INSTALL_LIBDIR)
  69 +       $(MKDIR) -p $(DESTDIR)$(INSTALL_VAMPDIR)
  70 +       $(MKDIR) -p $(DESTDIR)$(INSTALL_LADSPADIR)
  71 +       $(MKDIR) -p $(DESTDIR)$(INSTALL_LRDFDIR)
  72 +       $(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR)
  73 +       cp $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR)
  74 +       cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
  75 +       cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
  76 +       cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION)
  77 +       cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR)
  78 +       cp vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR)
  79 +       cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR)
  80 +       cp ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR)
  81 +       cp ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
  82 +       sed "s,%PREFIX%,$$CBS_ROOT," rubberband.pc.in \
  83 +         > $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
  84  # DO NOT DELETE
  85
  86  src/rubberband-c.o: rubberband/rubberband-c.h