On Tue, 17 Apr 2012, Stuart Henderson wrote:

> makes sense to me, I'll try and test some things when I get my
> workstation updated - I would however also suggest bumping the library
> major of libsndfile.

You're completely right. Apparently, after a long day, I can forget
obvious things :-)

Updated diff following...

Index: audio/jack/Makefile
===================================================================
RCS file: /cvs/ports/audio/jack/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- audio/jack/Makefile 24 Jan 2012 08:03:52 -0000      1.20
+++ audio/jack/Makefile 18 Apr 2012 07:22:45 -0000
@@ -7,6 +7,7 @@ COMMENT =               low latency sound server
 V =                    0.121.3
 DISTNAME =             jack-audio-connection-kit-${V}
 PKGNAME =              jack-${V}
+REVISION =             0
 
 SHARED_LIBS +=         jack            0.0     # 0.28
 SHARED_LIBS +=         jackserver      0.0     # 0.28
@@ -22,8 +23,8 @@ PERMIT_PACKAGE_FTP =  Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
-WANTLIB += c celt0 m pthread readline samplerate sndfile sndio
-WANTLIB += termcap
+WANTLIB += FLAC c celt0 m ogg pthread readline samplerate
+WANTLIB += sndfile sndio termcap vorbis vorbisenc
 
 MASTER_SITES =         ${HOMEPAGE}downloads/
 
Index: audio/libsamplerate/Makefile
===================================================================
RCS file: /cvs/ports/audio/libsamplerate/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- audio/libsamplerate/Makefile        15 Nov 2010 00:22:47 -0000      1.15
+++ audio/libsamplerate/Makefile        18 Apr 2012 07:22:45 -0000
@@ -3,7 +3,7 @@
 COMMENT=       audio sample rate conversion library
 
 DISTNAME=      libsamplerate-0.1.7
-REVISION=      0
+REVISION=      1
 SHARED_LIBS=   samplerate      2.0     # .1.3
 CATEGORIES=    audio
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes
 
 MASTER_SITES=  ${HOMEPAGE}
 
-WANTLIB=       c m sndfile>=1
+WANTLIB=       FLAC c m ogg sndfile>=1 vorbis vorbisenc
 
 LIB_DEPENDS=   audio/libsndfile
 
Index: audio/libsndfile/Makefile
===================================================================
RCS file: /cvs/ports/audio/libsndfile/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- audio/libsndfile/Makefile   13 Jul 2011 22:24:05 -0000      1.22
+++ audio/libsndfile/Makefile   18 Apr 2012 07:22:45 -0000
@@ -3,9 +3,10 @@
 COMMENT=       library to handle various audio file formats
 
 DISTNAME=      libsndfile-1.0.25
+REVISION=      0
 CATEGORIES=    audio
 HOMEPAGE=      http://www.mega-nerd.com/libsndfile/
-SHARED_LIBS += sndfile              3.3      # .1.25
+SHARED_LIBS += sndfile              4.0      # .1.25
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=  Yes
@@ -15,13 +16,16 @@ PERMIT_DISTFILES_FTP=       Yes
 
 MASTER_SITES=  ${HOMEPAGE}files/
 
-WANTLIB=       c m sndio
+WANTLIB=       FLAC c m ogg sndio vorbis vorbisenc
+
+LIB_DEPENDS=   audio/flac \
+               audio/libogg \
+               audio/libvorbis
 
 USE_LIBTOOL=   Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=        ${CONFIGURE_SHARED} \
                --disable-alsa \
-               --disable-external-libs \
                --disable-octave \
                --disable-sqlite
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/Cfg
Index: audio/pulseaudio/Makefile
===================================================================
RCS file: /cvs/ports/audio/pulseaudio/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- audio/pulseaudio/Makefile   23 Jan 2012 14:39:39 -0000      1.17
+++ audio/pulseaudio/Makefile   18 Apr 2012 07:22:46 -0000
@@ -6,7 +6,7 @@ COMMENT=                cross-platform networked sound
 
 VERSION=               1.1
 DISTNAME=              pulseaudio-${VERSION}
-REVISION=              2
+REVISION=              3
 
 SHARED_LIBS +=  pulse                1.0      # .13.4
 SHARED_LIBS +=  pulse-simple         0.0      # .0.3
@@ -25,8 +25,8 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB += c crypto execinfo gdbm glib-2.0 json ltdl m ossaudio
-WANTLIB += pcre pthread sndfile speexdsp ssl
+WANTLIB += FLAC c crypto execinfo gdbm glib-2.0 json ltdl m ogg
+WANTLIB += ossaudio pcre pthread sndfile speexdsp ssl vorbis vorbisenc
 
 MASTER_SITES=          http://freedesktop.org/software/pulseaudio/releases/
 TAR=                   ${LOCALBASE}/bin/gtar
Index: audio/speech-dispatcher/Makefile
===================================================================
RCS file: /cvs/ports/audio/speech-dispatcher/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- audio/speech-dispatcher/Makefile    20 Oct 2011 11:28:27 -0000      1.1.1.1
+++ audio/speech-dispatcher/Makefile    18 Apr 2012 07:22:47 -0000
@@ -4,6 +4,8 @@ COMMENT=        common interface to speech synt
 
 DISTNAME=      speech-dispatcher-0.7.1
 
+REVISION=      0
+
 SHARED_LIBS +=  sdaudio              0.0      # 2.4
 SHARED_LIBS +=  speechd              0.0      # 5.0
 
@@ -17,8 +19,9 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB += ao c dotconf-1.1 espeak glib-2.0 gmodule-2.0 gthread-2.0
-WANTLIB += m pcre portaudio pthread sndfile sndio stdc++
+WANTLIB += FLAC ao c dotconf-1.1 espeak glib-2.0 gmodule-2.0
+WANTLIB += gthread-2.0 m ogg pcre portaudio pthread sndfile
+WANTLIB += sndio stdc++ vorbis vorbisenc
 
 MASTER_SITES=  http://devel.freebsoft.org/pub/projects/speechd/
 
Index: audio/twolame/Makefile
===================================================================
RCS file: /cvs/ports/audio/twolame/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- audio/twolame/Makefile      27 Dec 2011 09:44:15 -0000      1.1.1.1
+++ audio/twolame/Makefile      18 Apr 2012 07:22:47 -0000
@@ -3,6 +3,7 @@
 COMMENT=       optimised MPEG Audio Layer 2 (MP2) encoder
 
 DISTNAME=      twolame-0.3.13
+REVISION=      0
 SHARED_LIBS +=  twolame              0.0      # 0.0
 
 CATEGORIES=    audio
@@ -17,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=twolame/}
 
-WANTLIB=       c m sndfile
+WANTLIB=       FLAC c ogg m sndfile vorbis vorbisenc
 
 LIB_DEPENDS=   audio/libsndfile
 
Index: emulators/mednafen/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mednafen/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- emulators/mednafen/Makefile 6 Sep 2011 19:21:52 -0000       1.2
+++ emulators/mednafen/Makefile 18 Apr 2012 07:23:05 -0000
@@ -4,6 +4,7 @@ COMMENT =       emulates numerous game console
 
 DISTNAME =     mednafen-0.8.D.3
 PKGNAME =      mednafen-0.8.3
+REVISION =     0
 
 CATEGORIES =   emulators games
 HOMEPAGE =     http://mednafen.sourceforge.net/
@@ -21,8 +22,8 @@ EXTRACT_SUFX =        .tar.bz2
 
 MODULES =      devel/gettext
 
-WANTLIB += SDL SDL_net c cdio m pthread sndfile sndio stdc++ usbhid
-WANTLIB += z
+WANTLIB += FLAC SDL SDL_net c cdio m ogg pthread sndfile sndio stdc++
+WANTLIB += usbhid vorbis vorbisenc z
 
 USE_GMAKE =    Yes
 
Index: multimedia/gstreamer-0.10/plugins-bad/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- multimedia/gstreamer-0.10/plugins-bad/Makefile      5 Mar 2012 15:22:46 
-0000       1.64
+++ multimedia/gstreamer-0.10/plugins-bad/Makefile      18 Apr 2012 07:23:23 
-0000
@@ -11,6 +11,8 @@ PKGNAME-main =                gstreamer-plugins-bad-${
 PKGNAME-neon =         gstreamer-neon-${V}
 PKGNAME-mjpeg =                gstreamer-mjpeg-${V}
 
+REVISION-main =                0
+
 MULTI_PACKAGES =       -main -neon -mjpeg
 
 SHARED_LIBS +=  gstphotography-0.10       1.0 # 23.0
@@ -36,17 +38,17 @@ BUILD_DEPENDS +=        audio/ladspa \
                        graphics/libexif
 
 WANTLIB-main += ${WANTLIB}
-WANTLIB-main += BPM GL SDL SoundTouch X11 Xau Xdamage Xdmcp Xext Xfixes
+WANTLIB-main += BPM FLAC GL SDL SoundTouch X11 Xau Xdamage Xdmcp Xext Xfixes
 WANTLIB-main += Xrender Xxf86vm ass bz2 cairo cdaudio croco-0.6 crypto
 WANTLIB-main += curl dca drm dvdnav dvdread enca expat fontconfig
 WANTLIB-main += freetype gdk_pixbuf-2.0 gio-2.0 gsm gstaudio-0.10 gstbase-0.10
 WANTLIB-main += gstcontroller-0.10 gstinterfaces-0.10 gstpbutils-0.10
 WANTLIB-main += gstriff-0.10 gstrtp-0.10 gstsdp-0.10 gsttag-0.10 gstvideo-0.10
-WANTLIB-main += idn jasper lrdf mms mpcdec orc-0.4 pango-1.0 pangocairo-1.0
+WANTLIB-main += idn jasper lrdf mms mpcdec ogg orc-0.4 pango-1.0 pangocairo-1.0
 WANTLIB-main += pangoft2-1.0 pixman-1 png pthread-stubs raptor rsvg-2
-WANTLIB-main += schroedinger-1.0 sndfile sndio ssl stdc++ usbhid vpx
-WANTLIB-main += Xrandr fribidi gstapp-0.10 gstfft-0.10 jpeg spandsp tiff
-WANTLIB-main += xcb xcb-render xcb-shm xslt
+WANTLIB-main += schroedinger-1.0 sndfile sndio ssl stdc++ usbhid vorbis
+WANTLIB-main += vorbisenc vpx Xrandr fribidi gstapp-0.10 gstfft-0.10 jpeg
+WANTLIB-main += spandsp tiff xcb xcb-render xcb-shm xslt
 
 LIB_DEPENDS-main =     ${LIB_DEPENDS} \
                        ${P}/plugins-base \

Reply via email to