Changes 1.0.9:

* Add AVR format
* Improve handling of some WAV files

6 files changed, 30 insertions, 30 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 9e830049e75..7bd6236e0fc 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/03/29 08:08:13 adam Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/02 10:13:43 adam Exp $
 #
 
-DISTNAME=	libsndfile-1.0.8
+DISTNAME=	libsndfile-1.0.9
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/
 
diff --git a/audio/libsndfile/PLIST b/audio/libsndfile/PLIST
index c880dc8b01f..7e80ac282e8 100644
--- a/audio/libsndfile/PLIST
+++ b/audio/libsndfile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/03/29 08:08:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/04/02 10:13:43 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.8
+lib/libsndfile.so.1.9
 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 7df9b9d392d..3a520b51bb4 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2004/04/02 09:37:56 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2004/04/02 10:13:43 adam Exp $
 
-SHA1 (libsndfile-1.0.8.tar.gz) = d2bfeb1b1303ace8e1de0498ed825b3b2f124cb2
-Size (libsndfile-1.0.8.tar.gz) = 767873 bytes
-SHA1 (patch-aa) = 711c997c6ebc449a7b602bd6d82156c637d7b8f3
+SHA1 (libsndfile-1.0.9.tar.gz) = 05aabce19b73cc7a05f8d9cfcb21d6f686c4ed9c
+Size (libsndfile-1.0.9.tar.gz) = 776011 bytes
+SHA1 (patch-aa) = 063d610cbf031b49dd7befa84c22b6f9ab0a21f3
 SHA1 (patch-ab) = 249e605fb37a6b29e4cf7ba4809901e4aab6b584
-SHA1 (patch-ac) = a88ee2a08da33ff1b775d56e073ea9193e2c9c7f
-SHA1 (patch-ad) = 64b70719fa944eb241c88e77beaf67e017568da1
+SHA1 (patch-ac) = 61bde4104e38ad506998264a9b8218de35447150
+SHA1 (patch-ad) = 75b5243c963bf03b7a979f57b93d6a3de2da669c
 SHA1 (patch-ae) = fb5a03eb15212bdd28ce395e4bd382bc885ce093
 SHA1 (patch-af) = 229534b39e182da2ae1ec54f94c7b837ddf3ba58
 SHA1 (patch-ag) = d8e953da32ac0eb8c700f879cd491b1b977a216d
diff --git a/audio/libsndfile/patches/patch-aa b/audio/libsndfile/patches/patch-aa
index e4d6a8e342b..f04f9f73b10 100644
--- a/audio/libsndfile/patches/patch-aa
+++ b/audio/libsndfile/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/03/29 08:08:13 adam Exp $
+$NetBSD: patch-aa,v 1.6 2004/04/02 10:13:43 adam Exp $
 
---- src/Makefile.in.orig	2004-03-14 08:43:56.000000000 +0000
+--- src/Makefile.in.orig	2004-03-30 11:25:19.000000000 +0000
 +++ src/Makefile.in
-@@ -859,7 +859,7 @@ libsndfile.def: create_symbols_file.py
+@@ -861,7 +861,7 @@ libsndfile.def: create_symbols_file.py
  	./create_symbols_file.py win32 $(VERSION) > libsndfile.def
  
  # Fake dependancy to force the creation of these files.
diff --git a/audio/libsndfile/patches/patch-ac b/audio/libsndfile/patches/patch-ac
index 6eb03d15865..ea1a6e96089 100644
--- a/audio/libsndfile/patches/patch-ac
+++ b/audio/libsndfile/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.3 2004/03/29 08:08:13 adam Exp $
+$NetBSD: patch-ac,v 1.4 2004/04/02 10:13:43 adam Exp $
 
---- examples/sndfile-play.c.orig	2004-03-14 08:34:32.000000000 +0000
+--- examples/sndfile-play.c.orig	2004-03-17 09:39:29.000000000 +0000
 +++ examples/sndfile-play.c
-@@ -27,16 +27,21 @@
- #include <unistd.h>
+@@ -34,16 +34,21 @@
+ 	#include <sys/time.h>
  #endif
  
 -#if defined (__linux__)
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.3 2004/03/29 08:08:13 adam Exp $
  	#include <fcntl.h>
  	#include <sys/ioctl.h>
  	#include <sys/audioio.h>
-@@ -58,7 +63,7 @@
+@@ -328,7 +333,7 @@ alsa_write_float (snd_pcm_t *alsa_dev, f
  **	Linux/OSS functions for playing a sound.
  */
  
@@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.3 2004/03/29 08:08:13 adam Exp $
  
  static	int	linux_open_dsp_device (int channels, int srate) ;
  
-@@ -121,7 +126,7 @@ static int
+@@ -391,7 +396,7 @@ static int
  linux_open_dsp_device (int channels, int srate)
  {	int fd, stereo, temp, error ;
  
@@ -44,7 +44,7 @@ $NetBSD: patch-ac,v 1.3 2004/03/29 08:08:13 adam Exp $
  		(fd = open ("/dev/sound/dsp", O_WRONLY, 0)) == -1)
  	{	perror("linux_open_dsp_device : open ") ;
  		exit (1) ;
-@@ -487,7 +492,8 @@ win32_play (int argc, char *argv [])
+@@ -757,7 +762,8 @@ win32_play (int argc, char *argv [])
  **	Solaris.
  */
  
@@ -54,17 +54,17 @@ $NetBSD: patch-ac,v 1.3 2004/03/29 08:08:13 adam Exp $
  
  static void
  solaris_play (int argc, char *argv [])
-@@ -594,7 +600,7 @@ main (int argc, char *argv [])
+@@ -864,7 +870,7 @@ main (int argc, char *argv [])
  		return 1 ;
  		} ;
  
 -#if defined (__linux__)
-+#if defined (__linux__) || defined(USE_OSS)
- 	#if (defined (HAVE_ALSA) && HAVE_ALSA)
++#if defined (__linux__) || defined (USE_OSS)
+ 	#if HAVE_ALSA_ASOUNDLIB_H
  		if (access ("/proc/asound/cards", R_OK) == 0)
  			alsa_play (argc, argv) ;
-@@ -603,7 +609,8 @@ main (int argc, char *argv [])
- 	#endif
+@@ -873,7 +879,8 @@ main (int argc, char *argv [])
+ 		linux_play (argc, argv) ;
  #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 0c1c79d5c8d..ea06d32393c 100644
--- a/audio/libsndfile/patches/patch-ad
+++ b/audio/libsndfile/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.3 2004/02/13 14:57:20 adam Exp $
+$NetBSD: patch-ad,v 1.4 2004/04/02 10:13:43 adam Exp $
 
---- examples/Makefile.in.orig	2004-02-08 08:57:20.000000000 +0000
+--- examples/Makefile.in.orig	2004-03-30 11:25:36.000000000 +0000
 +++ examples/Makefile.in
-@@ -163,7 +163,7 @@ sndfile_info_SOURCES = sndfile-info.c 
+@@ -164,7 +164,7 @@ sndfile_info_SOURCES = sndfile-info.c 
  sndfile_info_LDADD = $(SNDFILEDIR)/libsndfile.la
  
  sndfile_play_SOURCES = sndfile-play.c 
--sndfile_play_LDADD = $(SNDFILEDIR)/libsndfile.la $(OS_SPECIFIC_LINKS)
-+sndfile_play_LDADD = $(SNDFILEDIR)/libsndfile.la $(OS_SPECIFIC_LINKS) $(LIBOSSAUDIO)
+-sndfile_play_LDADD = $(SNDFILEDIR)/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS)
++sndfile_play_LDADD = $(SNDFILEDIR)/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS) $(LIBOSSAUDIO)
  
  sndfile_convert_SOURCES = sndfile-convert.c 
  sndfile_convert_LDADD = $(SNDFILEDIR)/libsndfile.la