Changes 1.0.6:

Large file fix for Linux/Solaris
New functionality and Win32 improvements

6 files changed, 46 insertions, 29 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index bb7aedc25a0..f67d74211f1 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.11 2003/09/23 23:28:16 recht Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/13 14:57:20 adam Exp $
 #
 
-DISTNAME=	libsndfile-1.0.5
-PKGREVISION=	1
+DISTNAME=	libsndfile-1.0.6
 CATEGORIES=	audio
-MASTER_SITES=	http://www.zipworld.com.au/~erikd/libsndfile/
+MASTER_SITES=	http://www.mega-nerd.com/libsndfile/
 
 MAINTAINER=	dillo@giga.or.at
-HOMEPAGE=	http://www.zipworld.com.au/~erikd/libsndfile/
+HOMEPAGE=	http://www.mega-nerd.com/libsndfile/
 COMMENT=	Library for reading and writing audio files
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 PKGCONFIG_OVERRIDE=	sndfile.pc.in
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/audio/libsndfile/PLIST b/audio/libsndfile/PLIST
index 1d518b2b241..4037d4f7533 100644
--- a/audio/libsndfile/PLIST
+++ b/audio/libsndfile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/05/23 09:30:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/02/13 14:57:20 adam Exp $
 bin/sndfile-convert
 bin/sndfile-info
 bin/sndfile-play
@@ -7,7 +7,7 @@ lib/libsndfile.a
 lib/libsndfile.la
 lib/libsndfile.so
 lib/libsndfile.so.1
-lib/libsndfile.so.1.5
+lib/libsndfile.so.1.6
 lib/pkgconfig/sndfile.pc
 man/man1/sndfile-convert.1
 man/man1/sndfile-info.1
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 5b7c09389f8..0154d0fba1f 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2003/05/23 09:30:10 wiz Exp $
+$NetBSD: distinfo,v 1.8 2004/02/13 14:57:20 adam Exp $
 
-SHA1 (libsndfile-1.0.5.tar.gz) = 150dfc74caffad11a942cc3603dfa1a515cf7926
-Size (libsndfile-1.0.5.tar.gz) = 634706 bytes
-SHA1 (patch-ac) = 7d82013f1e4dbcdf59f066dc8c8614458f760c9e
-SHA1 (patch-ad) = 4f1601eb219fa1a6915be1fefb0cd58e1deaa601
+SHA1 (libsndfile-1.0.6.tar.gz) = 8d8a32267c6ea085d48de6d894c7b6d41b295fa5
+Size (libsndfile-1.0.6.tar.gz) = 788855 bytes
+SHA1 (patch-aa) = 7a1933b6b455827792013c345c78fa222528940b
+SHA1 (patch-ac) = 72dbeb8d5877d5032338d782af34606606bb79ed
+SHA1 (patch-ad) = 64b70719fa944eb241c88e77beaf67e017568da1
diff --git a/audio/libsndfile/patches/patch-aa b/audio/libsndfile/patches/patch-aa
new file mode 100644
index 00000000000..440fb6adc07
--- /dev/null
+++ b/audio/libsndfile/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2004/02/13 14:57:20 adam Exp $
+
+--- src/Makefile.in.orig	2004-02-13 15:47:17.000000000 +0000
++++ src/Makefile.in
+@@ -849,7 +849,7 @@ Symbols: create_symbols_file.sh
+ 
+ # Dependancies.
+ 
+-sndfile.c : Symbols
++sndfile.c:
+ 
+ aiff.c au.c au_g72x.c ircam.c mat4.c mat5.c nist.c paf.c pvf.c : sndfile.h common.h
+ raw.c svx.c voc.c w64.c wav.c wav_w64.c htk.c sd2.c rx2.c txw.c : sndfile.h common.h
diff --git a/audio/libsndfile/patches/patch-ac b/audio/libsndfile/patches/patch-ac
index 42a18e1f6f8..3863b7de99d 100644
--- a/audio/libsndfile/patches/patch-ac
+++ b/audio/libsndfile/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2002/10/18 13:26:12 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2004/02/13 14:57:20 adam Exp $
 
---- examples/sndfile-play.c.orig	Mon Aug  5 18:50:55 2002
+--- examples/sndfile-play.c.orig	2004-02-05 09:35:42.000000000 +0000
 +++ examples/sndfile-play.c
-@@ -20,16 +20,21 @@
- #include 	<unistd.h>
- #include 	<errno.h>
+@@ -27,16 +27,21 @@
+ #include <unistd.h>
+ #endif
  
 -#if defined (__linux__)
 +#if defined (__linux__) || defined(USE_OSS)
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.1 2002/10/18 13:26:12 jlam Exp $
  	#include <fcntl.h>
  	#include <sys/ioctl.h>
  	#include <sys/audioio.h>
-@@ -49,7 +54,7 @@
+@@ -57,7 +62,7 @@
  **	Linux/OSS functions for playing a sound.
  */
  
@@ -35,16 +35,16 @@ $NetBSD: patch-ac,v 1.1 2002/10/18 13:26:12 jlam Exp $
  
  static	int	linux_open_dsp_device (int channels, int srate) ;
  
-@@ -110,7 +115,7 @@ static int
+@@ -120,7 +125,7 @@ static int
  linux_open_dsp_device (int channels, int srate)
  {	int fd, stereo, temp, error ;
  
--	if ((fd = open ("/dev/dsp", O_WRONLY, 0)) == -1)
-+	if ((fd = open (DEV_DSP, O_WRONLY, 0)) == -1)
+-	if ((fd = open ("/dev/dsp", O_WRONLY, 0)) == -1 &&
++	if ((fd = open (DEV_DSP, O_WRONLY, 0)) == -1 &&
+ 		(fd = open ("/dev/sound/dsp", O_WRONLY, 0)) == -1)
  	{	perror("linux_open_dsp_device : open ") ;
  		exit (1) ;
- 		} ;
-@@ -468,7 +473,8 @@ win32_play (int argc, char *argv [])
+@@ -486,7 +491,8 @@ win32_play (int argc, char *argv [])
  **	Solaris.
  */
  
@@ -54,13 +54,17 @@ $NetBSD: patch-ac,v 1.1 2002/10/18 13:26:12 jlam Exp $
  
  static void
  solaris_play (int argc, char *argv [])
-@@ -562,11 +568,12 @@ main (int argc, char *argv [])
+@@ -593,7 +599,7 @@ main (int argc, char *argv [])
  		return 1 ;
  		} ;
  
 -#if defined (__linux__)
 +#if defined (__linux__) || defined(USE_OSS)
- 	linux_play (argc, argv) ;
+ 	#if (defined (HAVE_ALSA) && HAVE_ALSA)
+ 		if (access ("/proc/asound/cards", R_OK) == 0)
+ 			alsa_play (argc, argv) ;
+@@ -602,7 +608,8 @@ main (int argc, char *argv [])
+ 	#endif
  #elif (defined (__MACH__) && defined (__APPLE__))
  	macosx_play (argc, argv) ;
 -#elif (defined (sun) && defined (unix))
diff --git a/audio/libsndfile/patches/patch-ad b/audio/libsndfile/patches/patch-ad
index e8f0ed6430b..0c1c79d5c8d 100644
--- a/audio/libsndfile/patches/patch-ad
+++ b/audio/libsndfile/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2002/12/14 17:30:33 jmmv Exp $
+$NetBSD: patch-ad,v 1.3 2004/02/13 14:57:20 adam Exp $
 
---- examples/Makefile.in.orig	Sun Nov 24 07:02:46 2002
+--- examples/Makefile.in.orig	2004-02-08 08:57:20.000000000 +0000
 +++ examples/Makefile.in
-@@ -115,7 +115,7 @@ sndfile_info_SOURCES = sndfile-info.c 
+@@ -163,7 +163,7 @@ sndfile_info_SOURCES = sndfile-info.c 
  sndfile_info_LDADD = $(SNDFILEDIR)/libsndfile.la
  
  sndfile_play_SOURCES = sndfile-play.c