diff options
author | adam <adam@pkgsrc.org> | 2005-09-30 13:26:02 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2005-09-30 13:26:02 +0000 |
commit | 3b347872f8d00f1f9f684aceb3496afc7c091e84 (patch) | |
tree | bee2322befcc28e9de6b2380d1b3dd3784a4e06f /audio/libsndfile | |
parent | 9da154aeeba1069ce0cbf23285c8cdc5877c6b45 (diff) | |
download | pkgsrc-3b347872f8d00f1f9f684aceb3496afc7c091e84.tar.gz |
Changes 1.0.12:
* Add support for FLAC and Apple's Core Audio Format (CAF).
* Add virtual I/O interface (still needs docs).
* Cygwin and other Win32 fixes.
* Minor bug fixes and cleanups.
Diffstat (limited to 'audio/libsndfile')
-rw-r--r-- | audio/libsndfile/Makefile | 9 | ||||
-rw-r--r-- | audio/libsndfile/PLIST | 3 | ||||
-rw-r--r-- | audio/libsndfile/buildlink3.mk | 4 | ||||
-rw-r--r-- | audio/libsndfile/distinfo | 20 | ||||
-rw-r--r-- | audio/libsndfile/patches/patch-aa | 6 | ||||
-rw-r--r-- | audio/libsndfile/patches/patch-ab | 8 | ||||
-rw-r--r-- | audio/libsndfile/patches/patch-ac | 14 | ||||
-rw-r--r-- | audio/libsndfile/patches/patch-ad | 10 | ||||
-rw-r--r-- | audio/libsndfile/patches/patch-ae | 10 | ||||
-rw-r--r-- | audio/libsndfile/patches/patch-af | 10 |
10 files changed, 49 insertions, 45 deletions
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile index ae9d4b04435..1534e47de08 100644 --- a/audio/libsndfile/Makefile +++ b/audio/libsndfile/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.30 2005/05/31 16:13:18 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2005/09/30 13:26:02 adam Exp $ -DISTNAME= libsndfile-1.0.11 +DISTNAME= libsndfile-1.0.12 CATEGORIES= audio MASTER_SITES= http://www.mega-nerd.com/libsndfile/ @@ -10,9 +10,9 @@ COMMENT= Library for reading and writing audio files PKG_INSTALLATION_TYPES= overwrite pkgviews -GNU_CONFIGURE= YES -USE_LIBTOOL= YES +USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= sndfile.pc.in +GNU_CONFIGURE= yes # This package compiles with gcc2, but its configure script doesn't know that CONFIGURE_ENV+= ac_cv_c_struct_hack=yes @@ -26,4 +26,5 @@ CONFIGURE_ENV+= F77=${FALSE} BUILDLINK_PASSTHRU_DIRS+= /Developer .endif +.include "../../audio/flac/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libsndfile/PLIST b/audio/libsndfile/PLIST index 372183325a2..45cbf8d9ceb 100644 --- a/audio/libsndfile/PLIST +++ b/audio/libsndfile/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.12 2004/09/22 08:09:16 jlam Exp $ +@comment $NetBSD: PLIST,v 1.13 2005/09/30 13:26:02 adam Exp $ bin/sndfile-convert bin/sndfile-info bin/sndfile-play +bin/sndfile-regtest include/sndfile.h lib/libsndfile.la lib/pkgconfig/sndfile.pc diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk index c09c5e835d0..6e8ce7fb88a 100644 --- a/audio/libsndfile/buildlink3.mk +++ b/audio/libsndfile/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:07 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2005/09/30 13:26:02 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSNDFILE_BUILDLINK3_MK:= ${LIBSNDFILE_BUILDLINK3_MK}+ @@ -16,4 +16,6 @@ BUILDLINK_RECOMMENDED.libsndfile+= libsndfile>=1.0.10nb1 BUILDLINK_PKGSRCDIR.libsndfile?= ../../audio/libsndfile .endif # LIBSNDFILE_BUILDLINK3_MK +.include "../../audio/flac/buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo index 64a8b52f445..1066984f127 100644 --- a/audio/libsndfile/distinfo +++ b/audio/libsndfile/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.15 2005/02/23 20:39:48 agc Exp $ +$NetBSD: distinfo,v 1.16 2005/09/30 13:26:02 adam Exp $ -SHA1 (libsndfile-1.0.11.tar.gz) = 16372a7814530178a2642bd22f203641e0392ebb -RMD160 (libsndfile-1.0.11.tar.gz) = 3829d1fa9f5caf16f4b589d03877d229cb8f5603 -Size (libsndfile-1.0.11.tar.gz) = 816107 bytes -SHA1 (patch-aa) = a0c533fa6631de205f824e8636d95f236488239e -SHA1 (patch-ab) = 09a8293a668f7497ca58945963a981542e401ff3 -SHA1 (patch-ac) = a4ff411abc342a357bd7cf6a8fe17e7829efc624 -SHA1 (patch-ad) = a71110072645dbaa1086b0ad024fc362d24990f6 -SHA1 (patch-ae) = 5a161296951242bbf0de12e54b84e376aaa46e7e -SHA1 (patch-af) = 830aa60311291464d370614156a20ee9c4c8cd6b +SHA1 (libsndfile-1.0.12.tar.gz) = 80ba583173651d649cfe5fea426caec07f2c1c63 +RMD160 (libsndfile-1.0.12.tar.gz) = ed7d7c93cda1f04260dfec505e05eb6e4874b3b4 +Size (libsndfile-1.0.12.tar.gz) = 798471 bytes +SHA1 (patch-aa) = df3dc9f51ce6e2f0ed67e0f40718645c907181d0 +SHA1 (patch-ab) = 69b1379ce4188c8034221f80de19fc7c54572654 +SHA1 (patch-ac) = 1faf09c8760981316c562dd2172b8e02546cc9fe +SHA1 (patch-ad) = 351de9e02478484c5f59eec4f7a4cbb47b3a6d90 +SHA1 (patch-ae) = 9df2c7facfad0a73168b94c292356b13a6660423 +SHA1 (patch-af) = 46348632b1a85fe5931f8002411892554569b4e4 SHA1 (patch-ag) = 10d0fcda9377fc6afa2dce9e4782f49889a4f4a3 diff --git a/audio/libsndfile/patches/patch-aa b/audio/libsndfile/patches/patch-aa index f1506e7f8de..7e9b02aaf28 100644 --- a/audio/libsndfile/patches/patch-aa +++ b/audio/libsndfile/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.8 2004/11/19 12:15:14 adam Exp $ +$NetBSD: patch-aa,v 1.9 2005/09/30 13:26:02 adam Exp $ ---- src/Makefile.in.orig 2004-11-15 10:53:04.000000000 +0000 +--- src/Makefile.in.orig 2005-09-29 20:00:35.000000000 +0000 +++ src/Makefile.in -@@ -881,7 +881,7 @@ libsndfile.def: create_symbols_file.py +@@ -833,7 +833,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-ab b/audio/libsndfile/patches/patch-ab index fb727ed933f..301b36cc8d1 100644 --- a/audio/libsndfile/patches/patch-ab +++ b/audio/libsndfile/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.5 2004/11/19 12:15:14 adam Exp $ +$NetBSD: patch-ab,v 1.6 2005/09/30 13:26:02 adam Exp $ ---- src/common.h.orig 2004-11-14 19:56:44.000000000 +0000 +--- src/common.h.orig 2005-09-18 02:36:57.000000000 +0000 +++ src/common.h -@@ -137,7 +137,7 @@ typedef struct - unsigned int timestamp ; /* secs since 1/1/1970 */ +@@ -150,7 +150,7 @@ typedef struct + #if HAVE_FLEXIBLE_ARRAY /* the per channel peak info */ - PEAK_POS peaks [] ; diff --git a/audio/libsndfile/patches/patch-ac b/audio/libsndfile/patches/patch-ac index 962c4fca0ce..170c7e83f4f 100644 --- a/audio/libsndfile/patches/patch-ac +++ b/audio/libsndfile/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.6 2004/11/19 12:15:14 adam Exp $ +$NetBSD: patch-ac,v 1.7 2005/09/30 13:26:02 adam Exp $ ---- examples/sndfile-play.c.orig 2004-11-14 19:57:17.000000000 +0000 +--- examples/sndfile-play.c.orig 2005-09-04 00:11:38.000000000 +0000 +++ examples/sndfile-play.c @@ -34,16 +34,21 @@ #include <sys/time.h> @@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.6 2004/11/19 12:15:14 adam Exp $ #include <fcntl.h> #include <sys/ioctl.h> #include <sys/audioio.h> -@@ -324,7 +329,7 @@ alsa_write_float (snd_pcm_t *alsa_dev, f +@@ -339,7 +344,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.6 2004/11/19 12:15:14 adam Exp $ static int linux_open_dsp_device (int channels, int srate) ; -@@ -387,7 +392,7 @@ static int +@@ -408,7 +413,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.6 2004/11/19 12:15:14 adam Exp $ (fd = open ("/dev/sound/dsp", O_WRONLY, 0)) == -1) { perror ("linux_open_dsp_device : open ") ; exit (1) ; -@@ -798,7 +803,8 @@ win32_play (int argc, char *argv []) +@@ -819,7 +824,8 @@ win32_play (int argc, char *argv []) ** Solaris. */ @@ -54,7 +54,7 @@ $NetBSD: patch-ac,v 1.6 2004/11/19 12:15:14 adam Exp $ static void solaris_play (int argc, char *argv []) -@@ -905,7 +911,7 @@ main (int argc, char *argv []) +@@ -926,7 +932,7 @@ main (int argc, char *argv []) return 1 ; } ; @@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.6 2004/11/19 12:15:14 adam Exp $ #if HAVE_ALSA_ASOUNDLIB_H if (access ("/proc/asound/cards", R_OK) == 0) alsa_play (argc, argv) ; -@@ -914,7 +920,8 @@ main (int argc, char *argv []) +@@ -935,7 +941,8 @@ main (int argc, char *argv []) linux_play (argc, argv) ; #elif (defined (__MACH__) && defined (__APPLE__)) macosx_play (argc, argv) ; diff --git a/audio/libsndfile/patches/patch-ad b/audio/libsndfile/patches/patch-ad index 9305f11d4bb..8816a081276 100644 --- a/audio/libsndfile/patches/patch-ad +++ b/audio/libsndfile/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.6 2004/11/19 12:15:14 adam Exp $ +$NetBSD: patch-ad,v 1.7 2005/09/30 13:26:02 adam Exp $ ---- examples/Makefile.in.orig 2004-11-15 10:53:01.000000000 +0000 +--- examples/Makefile.in.orig 2005-09-29 20:00:29.000000000 +0000 +++ examples/Makefile.in -@@ -168,7 +168,7 @@ sndfile_info_SOURCES = sndfile-info.c +@@ -235,7 +235,7 @@ INCLUDES = -I$(srcdir)/$(SNDFILEDIR) $(O + 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) $(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 + make_sine_SOURCES = make_sine.c diff --git a/audio/libsndfile/patches/patch-ae b/audio/libsndfile/patches/patch-ae index e120226ad0c..2244ff273a9 100644 --- a/audio/libsndfile/patches/patch-ae +++ b/audio/libsndfile/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.3 2004/11/19 12:15:14 adam Exp $ +$NetBSD: patch-ae,v 1.4 2005/09/30 13:26:02 adam Exp $ ---- src/ima_adpcm.c.orig 2004-11-19 13:05:19.000000000 +0000 +--- src/ima_adpcm.c.orig 2005-09-04 00:11:39.000000000 +0000 +++ src/ima_adpcm.c @@ -37,7 +37,7 @@ typedef struct IMA_ADPCM_PRIVATE_tag unsigned char *block ; short *samples ; #if HAVE_FLEXIBLE_ARRAY -- unsigned short data [] ; /* ISO C99 struct flexible array. */ -+ unsigned short *data ; /* ISO C99 struct flexible array. */ +- short data [] ; /* ISO C99 struct flexible array. */ ++ short *data ; /* ISO C99 struct flexible array. */ #else - unsigned short data [0] ; /* This is a hack and might not work. */ + short data [0] ; /* This is a hack and might not work. */ #endif diff --git a/audio/libsndfile/patches/patch-af b/audio/libsndfile/patches/patch-af index e7ff46ab404..f6f57e495dc 100644 --- a/audio/libsndfile/patches/patch-af +++ b/audio/libsndfile/patches/patch-af @@ -1,13 +1,13 @@ -$NetBSD: patch-af,v 1.3 2004/11/19 12:15:14 adam Exp $ +$NetBSD: patch-af,v 1.4 2005/09/30 13:26:02 adam Exp $ ---- src/ms_adpcm.c.orig 2004-10-17 00:46:34.000000000 +0000 +--- src/ms_adpcm.c.orig 2005-09-04 00:11:39.000000000 +0000 +++ src/ms_adpcm.c @@ -44,7 +44,7 @@ typedef struct short *samples ; unsigned char *block ; #if HAVE_FLEXIBLE_ARRAY -- unsigned short dummydata [] ; /* ISO C99 struct flexible array. */ -+ unsigned short *dummydata ; /* ISO C99 struct flexible array. */ +- short dummydata [] ; /* ISO C99 struct flexible array. */ ++ short *dummydata ; /* ISO C99 struct flexible array. */ #else - unsigned short dummydata [0] ; /* This is a hack an might not work. */ + short dummydata [0] ; /* This is a hack an might not work. */ #endif |