ladspa: 1.12 -> 1.13

4 files changed, 96 insertions, 5 deletions

diff --git a/ladspa/.footprint b/ladspa/.footprint
index 1e78b3033..df7698513 100644
--- a/ladspa/.footprint
+++ b/ladspa/.footprint
@@ -4,7 +4,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/applyplugin
 -rwxr-xr-x	root/root	usr/bin/listplugins
 drwxr-xr-x	root/root	usr/include/
--r--r--r--	root/root	usr/include/ladspa.h
+-rw-r--r--	root/root	usr/include/ladspa.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/ladspa/
 -rwxr-xr-x	root/root	usr/lib/ladspa/amp.so
diff --git a/ladspa/.md5sum b/ladspa/.md5sum
index 51b58f809..211d7e9c8 100644
--- a/ladspa/.md5sum
+++ b/ladspa/.md5sum
@@ -1,2 +1,2 @@
-33a2eb7ee38479fee6b2c2535be0a9b4  ladspa-1.12.patch
-dbd63dd701d80b152943073c84565c14  ladspa_sdk_1.12.tgz
+28ab6b5b85efb9611d904571d4bf82ca  ladspa-1.13.patch
+671be3e1021d0722cadc7fb27054628e  ladspa_sdk_1.13.tgz
diff --git a/ladspa/Pkgfile b/ladspa/Pkgfile
index b945b1c6c..b2232e20c 100644
--- a/ladspa/Pkgfile
+++ b/ladspa/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=ladspa
-version=1.12
+version=1.13
 release=1
 source=(http://www.ladspa.org/download/ladspa_sdk_$version.tgz \
 	ladspa-$version.patch)
@@ -13,7 +13,16 @@ source=(http://www.ladspa.org/download/ladspa_sdk_$version.tgz \
 build() {
 	cd ladspa_sdk/src
 	patch -p2 -i $SRC/ladspa-$version.patch
-	export CFLAGS="${CFLAGS//-O?/-O3}" CXXFLAGS="${CXXFLAGS//-O?/-O3}"
+
+	export \
+		CFLAGS="${CFLAGS//-O?/-O3}" \
+		CXXFLAGS="${CXXFLAGS//-O?/-O3}"
+
+	sed -i \
+		-e "s/@CFLAGS@/$CFLAGS/" \
+		-e "s/@CXXFLAGS@/$CXXFLAGS/" \
+		makefile
+
 	make
 	make DESTDIR=$PKG install
 }
diff --git a/ladspa/ladspa-1.13.patch b/ladspa/ladspa-1.13.patch
new file mode 100644
index 000000000..04dd90afb
--- /dev/null
+++ b/ladspa/ladspa-1.13.patch
@@ -0,0 +1,82 @@
+diff -pruN ladspa_sdk.orig/src/makefile ladspa_sdk/src/makefile
+--- ladspa_sdk.orig/src/makefile	2007-11-06 23:33:34.000000000 +1100
++++ ladspa_sdk/src/makefile	2007-11-06 23:58:27.000000000 +1100
+@@ -4,9 +4,9 @@
+ #
+ # Change these if you want to install somewhere else.
+ 
+-INSTALL_PLUGINS_DIR	=	/usr/lib/ladspa/
+-INSTALL_INCLUDE_DIR	=	/usr/include/
+-INSTALL_BINARY_DIR	=	/usr/bin/
++INSTALL_PLUGINS_DIR	=	$(DESTDIR)/usr/lib/ladspa/
++INSTALL_INCLUDE_DIR	=	$(DESTDIR)/usr/include/
++INSTALL_BINARY_DIR	=	$(DESTDIR)/usr/bin/
+ 
+ ###############################################################################
+ #
+@@ -15,7 +15,7 @@ INSTALL_BINARY_DIR	=	/usr/bin/
+ 
+ INCLUDES	=	-I.
+ LIBRARIES	=	-ldl -lm
+-CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
++CFLAGS		=	$(INCLUDES) -Wall -Werror -fPIC @CFLAGS@
+-CXXFLAGS	=	$(CFLAGS)
++CXXFLAGS	=	$(INCLUDES) -Wall -Werror -fPIC @CXXFLAGS@
+ PLUGINS		=	../plugins/amp.so				\
+ 			../plugins/delay.so				\
+@@ -46,22 +46,22 @@ CPP		=	c++
+ # TARGETS
+ #
+ 
+-test:	/tmp/test.wav ../snd/noise.wav always
+-	@echo ---------------------------------------------
+-	@echo First listen to the white noise input signal:
+-	@echo ---------------------------------------------
+-	-sndfile-play ../snd/noise.wav
+-	@echo -------------------------
+-	@echo Compare to plugin output.
+-	@echo -------------------------
+-	@echo Should be a noise band around 6000Hz, repeated quietly after 1s.
+-	-sndfile-play /tmp/test.wav
+-	@echo Test complete.
++test:
++#	@echo ---------------------------------------------
++#	@echo First listen to the white noise input signal:
++#	@echo ---------------------------------------------
++#	-sndfile-play ../snd/noise.wav
++#	@echo -------------------------
++#	@echo Compare to plugin output.
++#	@echo -------------------------
++#	@echo Should be a noise band around 6000Hz, repeated quietly after 1s.
++#	-sndfile-play /tmp/test.wav
++#	@echo Test complete.
+ 
+ install:	targets
+-	-mkdirhier $(INSTALL_PLUGINS_DIR)
+-	-mkdirhier $(INSTALL_INCLUDE_DIR)
+-	-mkdirhier $(INSTALL_BINARY_DIR)
++	install -d $(INSTALL_PLUGINS_DIR)
++	install -d $(INSTALL_INCLUDE_DIR)
++	install -d $(INSTALL_BINARY_DIR)
+ 	cp ../plugins/* $(INSTALL_PLUGINS_DIR)
+ 	cp ladspa.h $(INSTALL_INCLUDE_DIR)
+ 	cp ../bin/* $(INSTALL_BINARY_DIR)
+diff -pruN ladspa_sdk.orig/src/plugins/sine.cpp ladspa_sdk/src/plugins/sine.cpp
+--- ladspa_sdk.orig/src/plugins/sine.cpp	2007-11-06 23:33:34.000000000 +1100
++++ ladspa_sdk/src/plugins/sine.cpp	2007-11-06 23:59:26.000000000 +1100
+@@ -68,6 +68,15 @@ initialise_sine_table() {
+ 
+ /*****************************************************************************/
+ 
++LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *, unsigned long SampleRate);
++void connectPortToSineOscillator(LADSPA_Handle Instance, unsigned long Port, LADSPA_Data * DataLocation);
++void activateSineOscillator(void * pvHandle);
++void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount);
++void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount);
++void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount);
++void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount);
++void cleanupSineOscillator(void *pvHandle);
++
+ class SineOscillator {
+ private:
+