Sat Feb 21 13:20:45 2009 UTC ()
Update to 1.0.18:

Version 1.0.18 (2009-02-07)
  * Add Ogg/Vorbis support (thanks to John ffitch).
  * Remove captive FLAC library.
  * Many new features and bug fixes.
  * Generate Win32 and Win64 pre-compiled binaries.

Add ogg and vorbis dependencies to bl3.mk and increase ABI depends.


(wiz)
diff -r1.47 -r1.48 pkgsrc/audio/libsndfile/Makefile
diff -r1.14 -r1.15 pkgsrc/audio/libsndfile/PLIST
diff -r1.11 -r1.12 pkgsrc/audio/libsndfile/buildlink3.mk
diff -r1.25 -r1.26 pkgsrc/audio/libsndfile/distinfo
diff -r1.13 -r0 pkgsrc/audio/libsndfile/patches/patch-aa
diff -r1.9 -r0 pkgsrc/audio/libsndfile/patches/patch-ac
diff -r1.10 -r0 pkgsrc/audio/libsndfile/patches/patch-ad
diff -r1.1 -r0 pkgsrc/audio/libsndfile/patches/patch-ah
diff -r1.1 -r0 pkgsrc/audio/libsndfile/patches/patch-ba
cvs diff -r1.47 -r1.48 pkgsrc/audio/libsndfile/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libsndfile/Makefile 2009/01/13 12:13:45 1.47
+++ pkgsrc/audio/libsndfile/Makefile 2009/02/21 13:20:45 1.48
@@ -1,39 +1,44 @@ @@ -1,39 +1,44 @@
1# $NetBSD: Makefile,v 1.47 2009/01/13 12:13:45 drochner Exp $ 1# $NetBSD: Makefile,v 1.48 2009/02/21 13:20:45 wiz Exp $
2 2
3DISTNAME= libsndfile-1.0.17 3DISTNAME= libsndfile-1.0.18
4PKGREVISION= 5 
5CATEGORIES= audio 4CATEGORIES= audio
6MASTER_SITES= http://www.mega-nerd.com/libsndfile/ 5MASTER_SITES= http://www.mega-nerd.com/libsndfile/
7 6
8PATCHFILES= libsndfile-1.0.17+flac-1.1.3.patch.bz2 
9PATCH_SITES= ${MASTER_SITE_GENTOO:=distfiles/} 
10PATCH_DIST_STRIP= -p1 
11 
12MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.mega-nerd.com/libsndfile/ 8HOMEPAGE= http://www.mega-nerd.com/libsndfile/
14COMMENT= Library for reading and writing audio files 9COMMENT= Library for reading and writing audio files
15 10
16PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
17PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
18 13
 14USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 15USE_LIBTOOL= yes
 16USE_TOOLS= pkg-config
20PKGCONFIG_OVERRIDE= sndfile.pc.in 17PKGCONFIG_OVERRIDE= sndfile.pc.in
21GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
22 19
23MAKE_JOBS_SAFE= no 20MAKE_JOBS_SAFE= no
24 21
 22SUBST_CLASSES+= vorbis
 23SUBST_FILES.vorbis= configure
 24SUBST_SED.vorbis= "s/1\.2\.1/1.2.0/g"
 25SUBST_STAGE.vorbis= pre-configure
 26SUBST_MESSAGE.vorbis= Allowing libvorbis-1.2.0.
 27
25# This package compiles with gcc2, but its configure script doesn't know that 28# This package compiles with gcc2, but its configure script doesn't know that
26CONFIGURE_ENV+= ac_cv_c_struct_hack=yes 29CONFIGURE_ENV+= ac_cv_c_struct_hack=yes
27# Avoid an ICE in gcc2 on sparc64 
28CONFIGURE_ENV+= F77=${FALSE:Q} 
29 30
30.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
31 32
32.include "options.mk" 33.include "options.mk"
33 34
34.if ${OPSYS} == "Darwin" 35.if ${OPSYS} == "Darwin"
35BUILDLINK_PASSTHRU_DIRS+= /Developer 36BUILDLINK_PASSTHRU_DIRS+= /Developer
36.endif 37.endif
37 38
38.include "../../audio/flac/buildlink3.mk" 39.include "../../audio/flac/buildlink3.mk"
 40#BUILDLINK_API_DEPENDS.libvorbis+= libvorbis>=1.2.1
 41.include "../../audio/libvorbis/buildlink3.mk"
 42BUILDLINK_API_DEPENDS.libogg+= libogg>=1.1.3
 43.include "../../multimedia/libogg/buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/audio/libsndfile/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/libsndfile/PLIST 2006/09/01 06:02:23 1.14
+++ pkgsrc/audio/libsndfile/PLIST 2009/02/21 13:20:45 1.15
@@ -1,35 +1,34 @@ @@ -1,35 +1,34 @@
1@comment $NetBSD: PLIST,v 1.14 2006/09/01 06:02:23 adam Exp $ 1@comment $NetBSD: PLIST,v 1.15 2009/02/21 13:20:45 wiz Exp $
 2bin/sndfile-cmp
2bin/sndfile-convert 3bin/sndfile-convert
3bin/sndfile-info 4bin/sndfile-info
 5bin/sndfile-jackplay
 6bin/sndfile-metadata-get
 7bin/sndfile-metadata-set
4bin/sndfile-play 8bin/sndfile-play
5bin/sndfile-regtest 9bin/sndfile-regtest
6include/sndfile.h 10include/sndfile.h
7include/sndfile.hh 11include/sndfile.hh
8lib/libsndfile.la 12lib/libsndfile.la
9lib/pkgconfig/sndfile.pc 13lib/pkgconfig/sndfile.pc
10man/man1/sndfile-convert.1 14man/man1/sndfile-convert.1
11man/man1/sndfile-info.1 15man/man1/sndfile-info.1
12man/man1/sndfile-play.1 16man/man1/sndfile-play.1
13share/doc/libsndfile1-dev/html/FAQ.html 17share/doc/libsndfile1-dev/html/FAQ.html
14share/doc/libsndfile1-dev/html/api.html 18share/doc/libsndfile1-dev/html/api.html
15share/doc/libsndfile1-dev/html/bugs.html 19share/doc/libsndfile1-dev/html/bugs.html
16share/doc/libsndfile1-dev/html/command.html 20share/doc/libsndfile1-dev/html/command.html
17share/doc/libsndfile1-dev/html/dither.html 21share/doc/libsndfile1-dev/html/dither.html
18share/doc/libsndfile1-dev/html/embedded_files.html 22share/doc/libsndfile1-dev/html/embedded_files.html
19share/doc/libsndfile1-dev/html/index.html 23share/doc/libsndfile1-dev/html/index.html
20share/doc/libsndfile1-dev/html/libsndfile.css 24share/doc/libsndfile1-dev/html/libsndfile.css
21share/doc/libsndfile1-dev/html/libsndfile.jpg 25share/doc/libsndfile1-dev/html/libsndfile.jpg
22share/doc/libsndfile1-dev/html/lists.html 26share/doc/libsndfile1-dev/html/lists.html
23share/doc/libsndfile1-dev/html/new_file_type.HOWTO 27share/doc/libsndfile1-dev/html/new_file_type.HOWTO
24share/doc/libsndfile1-dev/html/octave.html 28share/doc/libsndfile1-dev/html/octave.html
25share/doc/libsndfile1-dev/html/pkgconfig.html 29share/doc/libsndfile1-dev/html/pkgconfig.html
26share/doc/libsndfile1-dev/html/sndfile_info.html 30share/doc/libsndfile1-dev/html/sndfile_info.html
 31share/doc/libsndfile1-dev/html/tutorial.html
27share/doc/libsndfile1-dev/html/win32.html 32share/doc/libsndfile1-dev/html/win32.html
28share/octave/site/m/sndfile_load.m 
29share/octave/site/m/sndfile_play.m 
30share/octave/site/m/sndfile_save.m 
31@dirrm share/doc/libsndfile1-dev/html 33@dirrm share/doc/libsndfile1-dev/html
32@dirrm share/doc/libsndfile1-dev 34@dirrm share/doc/libsndfile1-dev
33@dirrm share/octave/site/m 
34@dirrm share/octave/site 
35@dirrm share/octave 
cvs diff -r1.11 -r1.12 pkgsrc/audio/libsndfile/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/audio/libsndfile/buildlink3.mk 2007/01/07 12:25:52 1.11
+++ pkgsrc/audio/libsndfile/buildlink3.mk 2009/02/21 13:20:45 1.12
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.11 2007/01/07 12:25:52 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.12 2009/02/21 13:20:45 wiz Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4LIBSNDFILE_BUILDLINK3_MK:= ${LIBSNDFILE_BUILDLINK3_MK}+ 4LIBSNDFILE_BUILDLINK3_MK:= ${LIBSNDFILE_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= libsndfile 7BUILDLINK_DEPENDS+= libsndfile
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsndfile} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsndfile}
11BUILDLINK_PACKAGES+= libsndfile 11BUILDLINK_PACKAGES+= libsndfile
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsndfile 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsndfile
13 13
14.if !empty(LIBSNDFILE_BUILDLINK3_MK:M+) 14.if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.libsndfile+= libsndfile>=1.0.0 15BUILDLINK_API_DEPENDS.libsndfile+= libsndfile>=1.0.0
16BUILDLINK_ABI_DEPENDS.libsndfile+= libsndfile>=1.0.17nb1 16BUILDLINK_ABI_DEPENDS.libsndfile+= libsndfile>=1.0.18
17BUILDLINK_PKGSRCDIR.libsndfile?= ../../audio/libsndfile 17BUILDLINK_PKGSRCDIR.libsndfile?= ../../audio/libsndfile
18.endif # LIBSNDFILE_BUILDLINK3_MK 18.endif # LIBSNDFILE_BUILDLINK3_MK
19 19
 20.include "../../audio/libvorbis/buildlink3.mk"
20.include "../../audio/flac/buildlink3.mk" 21.include "../../audio/flac/buildlink3.mk"
 22.include "../../multimedia/libogg/buildlink3.mk"
21 23
22BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.25 -r1.26 pkgsrc/audio/libsndfile/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/libsndfile/distinfo 2009/01/13 12:13:46 1.25
+++ pkgsrc/audio/libsndfile/distinfo 2009/02/21 13:20:45 1.26
@@ -1,13 +1,5 @@ @@ -1,13 +1,5 @@
1$NetBSD: distinfo,v 1.25 2009/01/13 12:13:46 drochner Exp $ 1$NetBSD: distinfo,v 1.26 2009/02/21 13:20:45 wiz Exp $
2 2
3SHA1 (libsndfile-1.0.17+flac-1.1.3.patch.bz2) = 10e0d19dfc8cf2a6bf499e0fa0d1ab17dca4c519 3SHA1 (libsndfile-1.0.18.tar.gz) = d0fb643dc5b1030cf769e06d1260c70320fc877e
4RMD160 (libsndfile-1.0.17+flac-1.1.3.patch.bz2) = fc6e6f03069c1ad8ee43f600f6ac2aa6e97bb1f5 4RMD160 (libsndfile-1.0.18.tar.gz) = 15b19f4df1d8ced6c25e234258fb3d88fe3cd2ae
5Size (libsndfile-1.0.17+flac-1.1.3.patch.bz2) = 3127 bytes 5Size (libsndfile-1.0.18.tar.gz) = 923666 bytes
6SHA1 (libsndfile-1.0.17.tar.gz) = 2f66798d596a15491fbd1191ded8125ed71ef411 
7RMD160 (libsndfile-1.0.17.tar.gz) = ae93822a4c587dcdd7c70d043d2a38ed2fe3a188 
8Size (libsndfile-1.0.17.tar.gz) = 819456 bytes 
9SHA1 (patch-aa) = a3bb33cc28c10c9aa23a0b066339a512dbd7b0e2 
10SHA1 (patch-ac) = ee4b99239e21fe1104bcec4b5579fe2b1039619c 
11SHA1 (patch-ad) = b730de6bb0716bece5f83c3100f9fc0f8eb2ae7d 
12SHA1 (patch-ah) = 8c936316ca1191f8893579a562ff705c8dde6f92 
13SHA1 (patch-ba) = 92ec08d4e021f121d2255760d601625df71e3805 
File Deleted: pkgsrc/audio/libsndfile/patches/Attic/patch-aa
File Deleted: pkgsrc/audio/libsndfile/patches/Attic/patch-ac
File Deleted: pkgsrc/audio/libsndfile/patches/Attic/patch-ad
File Deleted: pkgsrc/audio/libsndfile/patches/Attic/patch-ah
File Deleted: pkgsrc/audio/libsndfile/patches/Attic/patch-ba