diff options
author | wiz <wiz@pkgsrc.org> | 2011-11-29 19:39:30 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-11-29 19:39:30 +0000 |
commit | b2a8c0278da9159d7a0a8e332fa6aa89c9bf2fcb (patch) | |
tree | 8a49f271e76d2558b1d6c5d1eed0e7b2c4a0979c /audio | |
parent | 3828ce81ed76f5abaebeb428c21907f421209ae8 (diff) | |
download | pkgsrc-b2a8c0278da9159d7a0a8e332fa6aa89c9bf2fcb.tar.gz |
Update to 0.3.1:
Changes for Audio File Library version 0.3.1:
* Fix installation of man pages.
* Add support for Creative Voice File format.
* Support u-law and A-law compression in Core Audio Format files.
Changes for Audio File Library version 0.3.0:
* Define AFframecount and AFfileoffset as 64-bit integers regardless of
whether system specifies off_t as 64 bits.
* Added support for Core Audio Format.
* Added support for extensible WAVE format files.
* Fixed leak of miscellaneous data buffers. (Thanks to Stefano Magni
for finding and fixing this problem.)
* Fixed default mapping between integer and floating-point audio data.
* Fix handling of NeXT sound files with unspecified or inconsistent length.
* Added support for miscellaneous data in IFF/8SVX files.
* Added support for byte-swapped IRCAM sound files.
* Refactored file parsing and writing.
* Refactored audio conversion.
* Updated and expanded documentation.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/libaudiofile/Makefile | 9 | ||||
-rw-r--r-- | audio/libaudiofile/PLIST | 83 | ||||
-rw-r--r-- | audio/libaudiofile/buildlink3.mk | 8 | ||||
-rw-r--r-- | audio/libaudiofile/distinfo | 14 | ||||
-rw-r--r-- | audio/libaudiofile/patches/patch-ab | 13 | ||||
-rw-r--r-- | audio/libaudiofile/patches/patch-ae | 32 | ||||
-rw-r--r-- | audio/libaudiofile/patches/patch-af | 24 | ||||
-rw-r--r-- | audio/libaudiofile/patches/patch-configure | 42 | ||||
-rw-r--r-- | audio/libaudiofile/patches/patch-libaudiofile_util.cpp | 32 |
9 files changed, 168 insertions, 89 deletions
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile index fdb67902522..1aaef3b2a5c 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -1,19 +1,20 @@ -# $NetBSD: Makefile,v 1.45 2010/04/12 19:04:58 drochner Exp $ +# $NetBSD: Makefile,v 1.46 2011/11/29 19:39:30 wiz Exp $ -DISTNAME= audiofile-0.2.7 +DISTNAME= audiofile-0.3.1 PKGNAME= lib${DISTNAME} CATEGORIES= audio -MASTER_SITES= http://www.68k.org/~michael/audiofile/ \ - ${MASTER_SITE_GNOME:=sources/audiofile/0.2/} +MASTER_SITES= http://www.68k.org/~michael/audiofile/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://andromeda.68k.org/~michael/audiofile/ COMMENT= Sound library for SGI audio file +LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= YES +USE_LANGUAGES= c c++ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= audiofile.pc.in diff --git a/audio/libaudiofile/PLIST b/audio/libaudiofile/PLIST index 05f1af78e9e..137f2c239ba 100644 --- a/audio/libaudiofile/PLIST +++ b/audio/libaudiofile/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:32:14 joerg Exp $ -bin/audiofile-config +@comment $NetBSD: PLIST,v 1.5 2011/11/29 19:39:30 wiz Exp $ bin/sfconvert bin/sfinfo include/af_vfs.h @@ -7,19 +6,67 @@ include/audiofile.h include/aupvlist.h lib/libaudiofile.la lib/pkgconfig/audiofile.pc -share/aclocal/audiofile.m4 -share/doc/libaudiofile/afCloseFile -share/doc/libaudiofile/afGetFrameSize -share/doc/libaudiofile/afGetTrackBytes -share/doc/libaudiofile/afIntro -share/doc/libaudiofile/afNewFileSetup -share/doc/libaudiofile/afOpenFile -share/doc/libaudiofile/afQuery -share/doc/libaudiofile/afReadFrames -share/doc/libaudiofile/afReadMisc -share/doc/libaudiofile/afSeekFrame -share/doc/libaudiofile/afSetErrorHandler -share/doc/libaudiofile/afSetVirtualByteOrder -share/doc/libaudiofile/afWriteFrames -share/doc/libaudiofile/sfconvert -share/doc/libaudiofile/sfinfo +man/man1/sfconvert.1 +man/man1/sfinfo.1 +man/man3/afCloseFile.3 +man/man3/afGetDataOffset.3 +man/man3/afGetFrameCount.3 +man/man3/afGetFrameSize.3 +man/man3/afGetTrackBytes.3 +man/man3/afNewFileSetup.3 +man/man3/afOpenFile.3 +man/man3/afQuery.3 +man/man3/afQueryDouble.3 +man/man3/afQueryLong.3 +man/man3/afQueryPointer.3 +man/man3/afReadFrames.3 +man/man3/afReadMisc.3 +man/man3/afSeekFrame.3 +man/man3/afSeekMisc.3 +man/man3/afSetErrorHandler.3 +man/man3/afSetVirtualByteOrder.3 +man/man3/afSetVirtualChannels.3 +man/man3/afSetVirtualPCMMapping.3 +man/man3/afSetVirtualSampleFormat.3 +man/man3/afTellFrame.3 +man/man3/afWriteFrames.3 +man/man3/afWriteMisc.3 +share/doc/libaudiofile/afCloseFile.3 +share/doc/libaudiofile/afCloseFile.3.txt +share/doc/libaudiofile/afGetDataOffset.3 +share/doc/libaudiofile/afGetFrameCount.3 +share/doc/libaudiofile/afGetFrameCount.3.txt +share/doc/libaudiofile/afGetFrameSize.3 +share/doc/libaudiofile/afGetFrameSize.3.txt +share/doc/libaudiofile/afGetTrackBytes.3 +share/doc/libaudiofile/afNewFileSetup.3 +share/doc/libaudiofile/afNewFileSetup.3.txt +share/doc/libaudiofile/afOpenFile.3 +share/doc/libaudiofile/afOpenFile.3.txt +share/doc/libaudiofile/afQuery.3 +share/doc/libaudiofile/afQuery.3.txt +share/doc/libaudiofile/afQueryDouble.3 +share/doc/libaudiofile/afQueryLong.3 +share/doc/libaudiofile/afQueryPointer.3 +share/doc/libaudiofile/afReadFrames.3 +share/doc/libaudiofile/afReadFrames.3.txt +share/doc/libaudiofile/afReadMisc.3 +share/doc/libaudiofile/afReadMisc.3.txt +share/doc/libaudiofile/afSeekFrame.3 +share/doc/libaudiofile/afSeekFrame.3.txt +share/doc/libaudiofile/afSeekMisc.3 +share/doc/libaudiofile/afSetErrorHandler.3 +share/doc/libaudiofile/afSetErrorHandler.3.txt +share/doc/libaudiofile/afSetVirtualByteOrder.3 +share/doc/libaudiofile/afSetVirtualChannels.3 +share/doc/libaudiofile/afSetVirtualPCMMapping.3 +share/doc/libaudiofile/afSetVirtualSampleFormat.3 +share/doc/libaudiofile/afSetVirtualSampleFormat.3.txt +share/doc/libaudiofile/afTellFrame.3 +share/doc/libaudiofile/afWriteFrames.3 +share/doc/libaudiofile/afWriteFrames.3.txt +share/doc/libaudiofile/afWriteMisc.3 +share/doc/libaudiofile/sfconvert.1 +share/doc/libaudiofile/sfconvert.1.txt +share/doc/libaudiofile/sfinfo.1 +share/doc/libaudiofile/sfinfo.1.txt diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk index 755d87c4090..f43172889e2 100644 --- a/audio/libaudiofile/buildlink3.mk +++ b/audio/libaudiofile/buildlink3.mk @@ -1,13 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.15 2011/04/21 21:06:25 hans Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2011/11/29 19:39:30 wiz Exp $ BUILDLINK_TREE+= libaudiofile -.if !defined(AUDIOFILE_BUILDLINK3_MK) -AUDIOFILE_BUILDLINK3_MK:= +.if !defined(LIBAUDIOFILE_BUILDLINK3_MK) +LIBAUDIOFILE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libaudiofile+= libaudiofile>=0.2.1 BUILDLINK_ABI_DEPENDS.libaudiofile+= libaudiofile>=0.2.6nb1 BUILDLINK_PKGSRCDIR.libaudiofile?= ../../audio/libaudiofile -.endif # AUDIOFILE_BUILDLINK3_MK +.endif # LIBAUDIOFILE_BUILDLINK3_MK BUILDLINK_TREE+= -libaudiofile diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo index 6e8f9177729..7d7a8947d7e 100644 --- a/audio/libaudiofile/distinfo +++ b/audio/libaudiofile/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.14 2010/04/12 19:04:58 drochner Exp $ +$NetBSD: distinfo,v 1.15 2011/11/29 19:39:30 wiz Exp $ -SHA1 (audiofile-0.2.7.tar.gz) = 1d8a5bb0ca63c7047436f136fb1fb98ea886e920 -RMD160 (audiofile-0.2.7.tar.gz) = 70327d38c6a9057045f5c59f67f45e2f6f9bf677 -Size (audiofile-0.2.7.tar.gz) = 502448 bytes -SHA1 (patch-ab) = cd292a827aa18b9839305b2c62c3dbd526384430 -SHA1 (patch-ae) = 6dc99026b3448f436a5ccf638598344018329661 -SHA1 (patch-af) = d0d9b737bf6b3c5ea497ea16160fcee7aad4ffe2 +SHA1 (audiofile-0.3.1.tar.gz) = 39de137a691a7c12ea5dc468566eb7a146880ac3 +RMD160 (audiofile-0.3.1.tar.gz) = 26126ae4e095bc9d37b5184853fa545283684d03 +Size (audiofile-0.3.1.tar.gz) = 722557 bytes +SHA1 (patch-af) = 095d0bf52b7545718d8058f6474b6d9c05b6ceab +SHA1 (patch-configure) = 0bae38fd7634bca62d31173ccf04d2ae3ba140db +SHA1 (patch-libaudiofile_util.cpp) = be175d47b708fc8262926d014dca4f4ff50093e1 diff --git a/audio/libaudiofile/patches/patch-ab b/audio/libaudiofile/patches/patch-ab deleted file mode 100644 index d5efc8fbb42..00000000000 --- a/audio/libaudiofile/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.3 1999/04/28 12:18:20 tron Exp $ - ---- audiofile-config.in.orig Sat Nov 21 15:55:23 1998 -+++ audiofile-config.in Wed Apr 28 14:09:47 1999 -@@ -45,7 +45,7 @@ - echo $includes - ;; - --libs) -- libdirs=-L@libdir@ -+ libdirs="-L@libdir@ -Wl,-R@libdir@" - echo $libdirs -laudiofile -lm - ;; - *) diff --git a/audio/libaudiofile/patches/patch-ae b/audio/libaudiofile/patches/patch-ae deleted file mode 100644 index 18fb5c788b9..00000000000 --- a/audio/libaudiofile/patches/patch-ae +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2010/04/12 19:04:58 drochner Exp $ - -see Ubuntu bug 327018 - ---- libaudiofile/util.c.orig 2010-01-26 19:56:24.000000000 +0000 -+++ libaudiofile/util.c -@@ -343,10 +343,10 @@ int _af_format_sample_size_uncompressed - return size; - } - --float _af_format_sample_size (_AudioFormat *fmt, bool stretch3to4) -+double _af_format_sample_size (_AudioFormat *fmt, bool stretch3to4) - { - int compressionIndex; -- float squishFactor; -+ double squishFactor; - - compressionIndex = _af_compression_index_from_id(fmt->compressionType); - squishFactor = _af_compression[compressionIndex].squishFactor; -@@ -361,10 +361,10 @@ int _af_format_frame_size_uncompressed ( - fmt->channelCount; - } - --float _af_format_frame_size (_AudioFormat *fmt, bool stretch3to4) -+double _af_format_frame_size (_AudioFormat *fmt, bool stretch3to4) - { - int compressionIndex; -- float squishFactor; -+ double squishFactor; - - compressionIndex = _af_compression_index_from_id(fmt->compressionType); - squishFactor = _af_compression[compressionIndex].squishFactor; diff --git a/audio/libaudiofile/patches/patch-af b/audio/libaudiofile/patches/patch-af index 6f824106027..d0be102d295 100644 --- a/audio/libaudiofile/patches/patch-af +++ b/audio/libaudiofile/patches/patch-af @@ -1,16 +1,18 @@ -$NetBSD: patch-af,v 1.1 2010/04/12 19:04:58 drochner Exp $ +$NetBSD: patch-af,v 1.2 2011/11/29 19:39:30 wiz Exp $ ---- libaudiofile/util.h.orig 2010-01-26 19:55:15.000000000 +0000 +see Ubuntu bug 327018 + +--- libaudiofile/util.h.orig 2011-05-31 18:04:50.000000000 +0000 +++ libaudiofile/util.h -@@ -55,9 +55,9 @@ _Track *_af_filehandle_get_track (AFfile +@@ -54,9 +54,9 @@ bool _af_pv_getptr (AUpvlist pvlist, int - bool _af_unique_ids (int *ids, int nids, char *idname, int iderr); + bool _af_unique_ids (const int *ids, int nids, const char *idname, int iderr); --float _af_format_frame_size (_AudioFormat *format, bool stretch3to4); -+double _af_format_frame_size (_AudioFormat *format, bool stretch3to4); - int _af_format_frame_size_uncompressed (_AudioFormat *format, bool stretch3to4); --float _af_format_sample_size (_AudioFormat *format, bool stretch3to4); -+double _af_format_sample_size (_AudioFormat *format, bool stretch3to4); - int _af_format_sample_size_uncompressed (_AudioFormat *format, bool stretch3to4); +-float _af_format_frame_size (const AudioFormat *format, bool stretch3to4); ++double _af_format_frame_size (const AudioFormat *format, bool stretch3to4); + int _af_format_frame_size_uncompressed (const AudioFormat *format, bool stretch3to4); +-float _af_format_sample_size (const AudioFormat *format, bool stretch3to4); ++double _af_format_sample_size (const AudioFormat *format, bool stretch3to4); + int _af_format_sample_size_uncompressed (const AudioFormat *format, bool stretch3to4); - status _af_set_sample_format (_AudioFormat *f, int sampleFormat, int sampleWidth); + status _af_set_sample_format (AudioFormat *f, int sampleFormat, int sampleWidth); diff --git a/audio/libaudiofile/patches/patch-configure b/audio/libaudiofile/patches/patch-configure new file mode 100644 index 00000000000..42318da84c0 --- /dev/null +++ b/audio/libaudiofile/patches/patch-configure @@ -0,0 +1,42 @@ +$NetBSD: patch-configure,v 1.1 2011/11/29 19:39:30 wiz Exp $ + +Fix unportable test(1) construct. + +--- configure.orig 2011-11-29 18:37:26.000000000 +0000 ++++ configure +@@ -15241,7 +15241,7 @@ else + enable_coverage=no + fi + +- if test "$enable_coverage" == "yes"; then ++ if test "$enable_coverage" = "yes"; then + ENABLE_COVERAGE_TRUE= + ENABLE_COVERAGE_FALSE='#' + else +@@ -15250,7 +15250,7 @@ else + fi + + +-if test "$enable_coverage" == "yes"; then : ++if test "$enable_coverage" = "yes"; then : + COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage" + COVERAGE_LIBS="-lgcov" + +@@ -15354,7 +15354,7 @@ else + enable_valgrind=no + fi + +- if test "$enable_valgrind" == "yes"; then ++ if test "$enable_valgrind" = "yes"; then + ENABLE_VALGRIND_TRUE= + ENABLE_VALGRIND_FALSE='#' + else +@@ -15363,7 +15363,7 @@ else + fi + + +-if test "$enable_valgrind" == "yes"; then : ++if test "$enable_valgrind" = "yes"; then : + # Extract the first word of "valgrind", so it can be a program name with args. + set dummy valgrind; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/audio/libaudiofile/patches/patch-libaudiofile_util.cpp b/audio/libaudiofile/patches/patch-libaudiofile_util.cpp new file mode 100644 index 00000000000..c68e4a246b7 --- /dev/null +++ b/audio/libaudiofile/patches/patch-libaudiofile_util.cpp @@ -0,0 +1,32 @@ +$NetBSD: patch-libaudiofile_util.cpp,v 1.1 2011/11/29 19:39:30 wiz Exp $ + +see Ubuntu bug 327018 + +--- libaudiofile/util.cpp.orig 2011-05-31 18:04:50.000000000 +0000 ++++ libaudiofile/util.cpp +@@ -283,10 +283,10 @@ int _af_format_sample_size_uncompressed + return size; + } + +-float _af_format_sample_size (const AudioFormat *fmt, bool stretch3to4) ++double _af_format_sample_size (const AudioFormat *fmt, bool stretch3to4) + { + int compressionIndex; +- float squishFactor; ++ double squishFactor; + + compressionIndex = _af_compression_index_from_id(fmt->compressionType); + squishFactor = _af_compression[compressionIndex].squishFactor; +@@ -301,10 +301,10 @@ int _af_format_frame_size_uncompressed ( + fmt->channelCount; + } + +-float _af_format_frame_size (const AudioFormat *fmt, bool stretch3to4) ++double _af_format_frame_size (const AudioFormat *fmt, bool stretch3to4) + { + int compressionIndex; +- float squishFactor; ++ double squishFactor; + + compressionIndex = _af_compression_index_from_id(fmt->compressionType); + squishFactor = _af_compression[compressionIndex].squishFactor; |