Update to 1.13, set LICENSE.

Changes undocumented.

4 files changed, 36 insertions, 44 deletions

diff --git a/audio/ladspa/Makefile b/audio/ladspa/Makefile
index 8c071f006bd..6c735e63081 100644
--- a/audio/ladspa/Makefile
+++ b/audio/ladspa/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/07/07 15:23:05 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/08/16 14:17:44 wiz Exp $
 #
 
-DISTNAME=	ladspa_sdk_1.12
+DISTNAME=	ladspa_sdk_1.13
 PKGNAME=	${DISTNAME:S/_sdk_/-/}
-PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ladspa.org/download/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ladspa.org/
 COMMENT=	Linux Audio Developers Simple Plugin API
+LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/audio/ladspa/distinfo b/audio/ladspa/distinfo
index b6d3a62c93f..335d3ca6f8f 100644
--- a/audio/ladspa/distinfo
+++ b/audio/ladspa/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2009/07/07 15:23:05 joerg Exp $
+$NetBSD: distinfo,v 1.7 2009/08/16 14:17:44 wiz Exp $
 
-SHA1 (ladspa_sdk_1.12.tgz) = 36a3a7a00f96281ca443dcae15d33f462398c4d4
-RMD160 (ladspa_sdk_1.12.tgz) = 7967731c28785287691655d9346cf46654f4235b
-Size (ladspa_sdk_1.12.tgz) = 71165 bytes
-SHA1 (patch-aa) = c2b6603ffb2c75b7a70d1172ac039c68d3c8c5c4
-SHA1 (patch-ab) = 729277aaae806d9698e185f630aa6ec65f009d51
+SHA1 (ladspa_sdk_1.13.tgz) = 2b69e28afb62c0d97943124f48ed82de796f83ed
+RMD160 (ladspa_sdk_1.13.tgz) = e9eeae8edd24a6890fac3e34c4b55f844f44f8a0
+Size (ladspa_sdk_1.13.tgz) = 70540 bytes
+SHA1 (patch-aa) = 7d09109572f9da19aac4104437704d731fc3ff99
+SHA1 (patch-ab) = 13240faa2e14651f1d76e92aac0f181433d7260d
 SHA1 (patch-ac) = d3367fa484cc0b2d4cef733832de3b1ddc147bdb
diff --git a/audio/ladspa/patches/patch-aa b/audio/ladspa/patches/patch-aa
index f975744ead7..ce535e3ccc2 100644
--- a/audio/ladspa/patches/patch-aa
+++ b/audio/ladspa/patches/patch-aa
@@ -1,21 +1,21 @@
-$NetBSD: patch-aa,v 1.3 2009/07/07 15:23:05 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2009/08/16 14:17:44 wiz Exp $
 
---- makefile.orig	2004-02-28 17:30:22.000000000 +0100
-+++ makefile	2004-02-28 17:35:17.000000000 +0100
-@@ -5,9 +5,9 @@
- # Change these if you want to install somewhere else. In particularly
- # you may wish to remove the middle "local/" part of each entry.
+--- makefile.orig	2007-11-06 10:42:45.000000000 +0000
++++ makefile
+@@ -4,9 +4,9 @@
+ #
+ # Change these if you want to install somewhere else.
  
--INSTALL_PLUGINS_DIR	=	/usr/local/lib/ladspa/
+-INSTALL_PLUGINS_DIR	=	/usr/lib/ladspa/
 -INSTALL_INCLUDE_DIR	=	/usr/include/
--INSTALL_BINARY_DIR	=	/usr/local/bin/
-+INSTALL_PLUGINS_DIR	=	${PREFIX}/lib/ladspa
-+INSTALL_INCLUDE_DIR	=	${PREFIX}/include
-+INSTALL_BINARY_DIR	=	${PREFIX}/bin
+-INSTALL_BINARY_DIR	=	/usr/bin/
++INSTALL_PLUGINS_DIR	=	${PREFIX}/lib/ladspa/
++INSTALL_INCLUDE_DIR	=	${PREFIX}/include/
++INSTALL_BINARY_DIR	=	${PREFIX}/bin/
  
  ###############################################################################
  #
-@@ -15,8 +15,8 @@
+@@ -14,8 +14,8 @@ INSTALL_BINARY_DIR	=	/usr/bin/
  #
  
  INCLUDES	=	-I.
@@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.3 2009/07/07 15:23:05 joerg Exp $
  CXXFLAGS	=	$(CFLAGS)
  PLUGINS		=	../plugins/amp.so				\
  			../plugins/delay.so				\
-@@ -26,8 +26,8 @@
+@@ -25,8 +25,8 @@ PLUGINS		=	../plugins/amp.so				\
  PROGRAMS	=	../bin/analyseplugin				\
  			../bin/applyplugin 				\
  			../bin/listplugins
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.3 2009/07/07 15:23:05 joerg Exp $
  
  ###############################################################################
  #
-@@ -39,32 +39,19 @@
+@@ -38,8 +38,8 @@ CPP		=	c++
  	$(LD) -o ../plugins/$*.so plugins/$*.o -shared
  
  ../plugins/%.so:	plugins/%.cpp ladspa.h
@@ -48,36 +48,28 @@ $NetBSD: patch-aa,v 1.3 2009/07/07 15:23:05 joerg Exp $
  
  ###############################################################################
  #
- # TARGETS
- #
+@@ -58,13 +58,13 @@ test:	/tmp/test.wav ../snd/noise.wav alw
+ 	-sndfile-play /tmp/test.wav
+ 	@echo Test complete.
  
--test:	/tmp/test.wav ../snd/noise.wav always
--	@echo ---------------------------------------------
--	@echo First listen to the white noise input signal:
--	@echo ---------------------------------------------
--	play ../snd/noise.wav
--	@echo -------------------------
--	@echo Compare to plugin output.
--	@echo -------------------------
--	@echo Should be a noise band around 6000Hz, repeated quietly after 1s.
--	play /tmp/test.wav
--
 -install:	targets
--	-mkdirhier	$(INSTALL_PLUGINS_DIR)				\
--			$(INSTALL_INCLUDE_DIR)				\
--			$(INSTALL_BINARY_DIR)
+-	-mkdirhier $(INSTALL_PLUGINS_DIR)
+-	-mkdirhier $(INSTALL_INCLUDE_DIR)
+-	-mkdirhier $(INSTALL_BINARY_DIR)
 -	cp ../plugins/* $(INSTALL_PLUGINS_DIR)
 -	cp ladspa.h $(INSTALL_INCLUDE_DIR)
 -	cp ../bin/* $(INSTALL_BINARY_DIR)
 +install:
-+	$(BSD_INSTALL_DATA_DIR)	${DESTDIR}$(INSTALL_PLUGINS_DIR)
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL_PLUGINS_DIR)
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL_INCLUDE_DIR)
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL_BINARY_DIR)
 +	$(BSD_INSTALL_DATA) ../plugins/* ${DESTDIR}$(INSTALL_PLUGINS_DIR)
 +	$(BSD_INSTALL_DATA) ladspa.h ${DESTDIR}$(INSTALL_INCLUDE_DIR)
 +	$(BSD_INSTALL_PROGRAM) ../bin/* ${DESTDIR}$(INSTALL_BINARY_DIR)
  
  /tmp/test.wav:	targets ../snd/noise.wav
  	../bin/listplugins
-@@ -82,7 +69,7 @@
+@@ -82,7 +82,7 @@ install:	targets
  				../plugins/delay.so delay_5s 1 0.1	\
  				../plugins/amp.so amp_mono 4		\
  
diff --git a/audio/ladspa/patches/patch-ab b/audio/ladspa/patches/patch-ab
index 570183a629c..1f055c2ccad 100644
--- a/audio/ladspa/patches/patch-ab
+++ b/audio/ladspa/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2005/03/31 17:06:29 minskim Exp $
+$NetBSD: patch-ab,v 1.3 2009/08/16 14:17:44 wiz Exp $
 
---- applyplugin.c.orig	2004-02-28 17:11:28.000000000 +0100
-+++ applyplugin.c	2004-02-28 17:12:19.000000000 +0100
+--- applyplugin.c.orig	2007-11-06 10:52:56.000000000 +0000
++++ applyplugin.c
 @@ -6,7 +6,11 @@
  /*****************************************************************************/