diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-02-16 09:51:47 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-02-16 09:51:47 +0000 |
commit | 2c96e0fdaaadebb10100f1f7d5e461bdacc08547 (patch) | |
tree | e29dca9c15e069f6c0a8bc49f09802d500ab3508 /audio | |
parent | 5074fe769159f7494d3864db18fb2f707ddb206b (diff) | |
download | pkgsrc-2c96e0fdaaadebb10100f1f7d5e461bdacc08547.tar.gz |
bl3ify and upgrade darkice to 0.14.
This release adds ALSA support and support for downsampling streams from
stereo to mono when streaming in MP3 to an icecast 2 server. There is a
bugfix for conflicting symbols _X and _Y on Solaris, and a bugfix for a
segfault caused when saving an Ogg Vorbis stream to a file.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/darkice/Makefile | 15 | ||||
-rw-r--r-- | audio/darkice/PLIST | 5 | ||||
-rw-r--r-- | audio/darkice/distinfo | 9 | ||||
-rw-r--r-- | audio/darkice/patches/patch-aa | 15 | ||||
-rw-r--r-- | audio/darkice/patches/patch-ab | 143 | ||||
-rw-r--r-- | audio/darkice/patches/patch-ac | 13 |
6 files changed, 15 insertions, 185 deletions
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile index e60eb6858a8..1fee5c04b64 100644 --- a/audio/darkice/Makefile +++ b/audio/darkice/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2004/01/22 07:15:00 grant Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/16 09:51:47 xtraeme Exp $ # -DISTNAME= darkice-0.13.2 +DISTNAME= darkice-0.14 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=darkice/} @@ -9,13 +9,14 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://darkice.sourceforge.net/ COMMENT= IceCast, IceCast2 and ShoutCast live audio streamer -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make USE_PKGINSTALL= yes CONFIGURE_ARGS+= --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} CONFIGURE_ARGS+= --with-lame-prefix=${BUILDLINK_PREFIX.lame} +LIBS+= ${LIBOSSAUDIO} EGDIR= ${PREFIX}/share/examples/darkice HTMLDIR= ${PREFIX}/share/doc/html/darkice @@ -33,9 +34,9 @@ do-install: ${INSTALL_DATA} $$f ${HTMLDIR}; \ done -.include "../../audio/lame/buildlink2.mk" -.include "../../audio/libvorbis/buildlink2.mk" +.include "../../audio/lame/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" -.include "../../mk/pthread.buildlink2.mk" -.include "../../mk/ossaudio.buildlink2.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/darkice/PLIST b/audio/darkice/PLIST index 5f800eeaba6..b576380d474 100644 --- a/audio/darkice/PLIST +++ b/audio/darkice/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/09 17:23:45 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/02/16 09:51:47 xtraeme Exp $ bin/darkice man/man1/darkice.1 man/man5/darkice.conf.5 +share/doc/html/darkice/AlsaDspSource.html +share/doc/html/darkice/AlsaDspSource_h.html share/doc/html/darkice/AudioEncoder.html share/doc/html/darkice/AudioEncoder_h.html share/doc/html/darkice/AudioSource.html @@ -62,6 +64,7 @@ share/doc/html/darkice/aflibConverter_h.html share/doc/html/darkice/aflibDebug.html share/doc/html/darkice/aflibDebug_h.html share/doc/html/darkice/all-globals.html +share/doc/html/darkice/full-list-AlsaDspSource.html share/doc/html/darkice/full-list-AudioEncoder.html share/doc/html/darkice/full-list-AudioSource.html share/doc/html/darkice/full-list-BufferedSink.html diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo index eb9f8672f29..ed2b314dc51 100644 --- a/audio/darkice/distinfo +++ b/audio/darkice/distinfo @@ -1,7 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/01/09 17:23:44 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2004/02/16 09:51:47 xtraeme Exp $ -SHA1 (darkice-0.13.2.tar.gz) = 1ba958debc34424623e35de35ee130d1c5b03f02 -Size (darkice-0.13.2.tar.gz) = 329186 bytes -SHA1 (patch-aa) = ec927674c9d9e00a8178545ee8def243e5258b14 -SHA1 (patch-ab) = 6a81af90d01e37c6c08bbf0bb867907a5d2a9c42 -SHA1 (patch-ac) = 41065f71c20c7f14b1982d0f786a2c3fba93f091 +SHA1 (darkice-0.14.tar.gz) = 3c86c1f68ee7b1616911345ede1515652603b34f +Size (darkice-0.14.tar.gz) = 337956 bytes diff --git a/audio/darkice/patches/patch-aa b/audio/darkice/patches/patch-aa deleted file mode 100644 index 8613f64bc2d..00000000000 --- a/audio/darkice/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/01/09 17:23:45 xtraeme Exp $ - ---- src/aflibConverter.h.orig 2003-05-09 10:55:25.000000000 +0200 -+++ src/aflibConverter.h 2003-05-09 10:55:38.000000000 +0200 -@@ -222,8 +222,8 @@ - bool interpFilt; - bool largeFilter; - bool linearInterp; --short ** _X; --short ** _Y; -+short ** __X; -+short ** __Y; - unsigned int _Time; - double _factor; - int _nChans; diff --git a/audio/darkice/patches/patch-ab b/audio/darkice/patches/patch-ab deleted file mode 100644 index 83532dd6f3d..00000000000 --- a/audio/darkice/patches/patch-ab +++ /dev/null @@ -1,143 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/09 17:23:46 xtraeme Exp $ - ---- src/aflibConverter.cc.orig 2003-05-09 10:56:06.000000000 +0200 -+++ src/aflibConverter.cc 2003-05-09 10:56:19.000000000 +0200 -@@ -123,8 +123,8 @@ - largeFilter = high_quality; - linearInterp = linear_interpolation; - -- _X = NULL; -- _Y = NULL; -+ __X = NULL; -+ __Y = NULL; - _vol = 1.0; - } - -@@ -140,19 +140,19 @@ - int i; - - // Delete memory for the input and output arrays -- if (_X != NULL) -+ if (__X != NULL) - { - for (i = 0; i < _nChans; i++) - { -- delete [] _X[i]; -- _X[i] = NULL; -- delete [] _Y[i]; -- _Y[i] = NULL; -- } -- delete [] _X; -- _X = NULL; -- delete [] _Y; -- _Y = NULL; -+ delete [] __X[i]; -+ __X[i] = NULL; -+ delete [] __Y[i]; -+ __Y[i] = NULL; -+ } -+ delete [] __X; -+ __X = NULL; -+ delete [] __Y; -+ __Y = NULL; - } - } - -@@ -180,15 +180,15 @@ - _vol = volume; - - // Allocate all new memory -- _X = new short * [_nChans]; -- _Y = new short * [_nChans]; -+ __X = new short * [_nChans]; -+ __Y = new short * [_nChans]; - - for (i = 0; i < _nChans; i++) - { - // Add extra to allow of offset of input data (Xoff in main routine) -- _X[i] = new short[IBUFFSIZE + 256]; -- _Y[i] = new short[(int)(((double)IBUFFSIZE)*_factor)]; -- memset(_X[i], 0, sizeof(short) * (IBUFFSIZE + 256)); -+ __X[i] = new short[IBUFFSIZE + 256]; -+ __Y[i] = new short[(int)(((double)IBUFFSIZE)*_factor)]; -+ memset(__X[i], 0, sizeof(short) * (IBUFFSIZE + 256)); - } - } - -@@ -467,7 +467,7 @@ - do { - if (!last) /* If haven't read last sample yet */ - { -- last = readData(inCount, inArray, _X, -+ last = readData(inCount, inArray, __X, - IBUFFSIZE, (int)Xread,first_pass); - first_pass = FALSE; - if (last && (last-Xoff<Nx)) { /* If last sample has been read... */ -@@ -487,7 +487,7 @@ - orig_Nx = Nx; - Time2 = _Time; - /* Resample stuff in input buffer */ -- Nout=SrcLinear(_X[c],_Y[c],_factor,&Time2,orig_Nx,maxOutput); -+ Nout=SrcLinear(__X[c],__Y[c],_factor,&Time2,orig_Nx,maxOutput); - } - Nx = orig_Nx; - _Time = Time2; -@@ -504,7 +504,7 @@ - for (c = 0; c < _nChans; c++) - { - for (i=0; i<IBUFFSIZE-Xp+Xoff; i++) { /* Copy part of input signal */ -- _X[c][i] = _X[c][i+Xp-Xoff]; /* that must be re-used */ -+ __X[c][i] = __X[c][i+Xp-Xoff]; /* that must be re-used */ - } - } - if (last) { /* If near end of sample... */ -@@ -526,7 +526,7 @@ - - for (c = 0; c < _nChans; c++) - for (i = 0; i < Nout; i++) -- outArray[c * outCount + i + Ycount - Nout] = _Y[c][i]; -+ outArray[c * outCount + i + Ycount - Nout] = __Y[c][i]; - - total_inCount += Nx; - -@@ -583,7 +583,7 @@ - do { - if (!last) /* If haven't read last sample yet */ - { -- last = readData(inCount, inArray, _X, -+ last = readData(inCount, inArray, __X, - IBUFFSIZE, (int)Xread,first_pass); - first_pass = FALSE; - if (last && (last-Xoff<Nx)) { /* If last sample has been read... */ -@@ -604,11 +604,11 @@ - Time2 = _Time; - /* Resample stuff in input buffer */ - if (_factor >= 1) { /* SrcUp() is faster if we can use it */ -- Nout=SrcUp(_X[c],_Y[c],_factor, -+ Nout=SrcUp(__X[c],__Y[c],_factor, - &Time2,Nx,maxOutput,Nwing,LpScl,Imp,ImpD,interpFilt); - } - else { -- Nout=SrcUD(_X[c],_Y[c],_factor, -+ Nout=SrcUD(__X[c],__Y[c],_factor, - &Time2,Nx,maxOutput,Nwing,LpScl,Imp,ImpD,interpFilt); - } - } -@@ -642,7 +642,7 @@ - { - for (i = 0; i < Nout; i++) - { -- outArray[c * outCount + i + Ycount - Nout] = _Y[c][i]; -+ outArray[c * outCount + i + Ycount - Nout] = __Y[c][i]; - } - } - -@@ -651,7 +651,7 @@ - for (c = 0; c < _nChans; c++) - { - for (i=0; i<IBUFFSIZE-act_incount+Xoff; i++) { /* Copy part of input signal */ -- _X[c][i] = _X[c][i+act_incount]; /* that must be re-used */ -+ __X[c][i] = __X[c][i+act_incount]; /* that must be re-used */ - } - } - Xread = IBUFFSIZE - Nx; /* Pos in input buff to read new data into */ diff --git a/audio/darkice/patches/patch-ac b/audio/darkice/patches/patch-ac deleted file mode 100644 index cba316caf6d..00000000000 --- a/audio/darkice/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/01/09 17:23:46 xtraeme Exp $ - ---- src/Makefile.in.orig 2004-01-09 18:22:02.000000000 +0100 -+++ src/Makefile.in 2004-01-09 18:22:19.000000000 +0100 -@@ -82,7 +82,7 @@ - bin_PROGRAMS = darkice - CXXFLAGS = -O2 -pedantic -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@ - INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ --LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@ -+LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@ ${LIBOSSAUDIO} - - darkice_SOURCES = AudioEncoder.h\ - AudioSource.h\ |