Initial import of darkice-0.13.2 from pkgsrc-wip.

DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It takes
audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis, and sends
the streams to one or more IceCast, ShoutCast and/or IceCast2 servers. DarkIce
uses lame as a shared object as its mp3 encoder, and the Ogg Vorbis libs as its
Ogg Vorbis encoder.

8 files changed, 326 insertions, 1 deletions

diff --git a/audio/darkice/DESCR b/audio/darkice/DESCR
new file mode 100644
index 00000000000..800ae05e37c
--- /dev/null
+++ b/audio/darkice/DESCR
@@ -0,0 +1,5 @@
+DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It takes
+audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis, and sends
+the streams to one or more IceCast, ShoutCast and/or IceCast2 servers. DarkIce
+uses lame as a shared object as its mp3 encoder, and the Ogg Vorbis libs as its
+Ogg Vorbis encoder.
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
new file mode 100644
index 00000000000..b93e9df2711
--- /dev/null
+++ b/audio/darkice/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/01/09 17:23:44 xtraeme Exp $
+#
+
+DISTNAME=	darkice-0.13.2
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darkice/}
+
+MAINTAINER=	xtraeme@NetBSD.org
+HOMEPAGE=	http://darkice.sourceforge.net/
+COMMENT=	IceCast, IceCast2 and ShoutCast live audio streamer
+
+USE_BUILDLINK2=		yes
+GNU_CONFIGURE=		yes
+USE_GMAKE=		yes
+USE_PKGINSTALL=		yes
+
+CONFIGURE_ARGS+=	--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis}
+CONFIGURE_ARGS+=	--with-lame-prefix=${BUILDLINK_PREFIX.lame}
+
+EGDIR=		${PREFIX}/share/examples/darkice
+HTMLDIR=	${PREFIX}/share/doc/html/darkice
+
+CONF_FILES=	${EGDIR}/darkice.conf.default ${PKG_SYSCONFDIR}/darkice.conf
+
+do-install:
+	${INSTALL_DATA_DIR} ${EGDIR} ${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/darkice.cfg ${EGDIR}/darkice.conf.default
+	${INSTALL_PROGRAM} ${WRKSRC}/src/darkice ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/darkice.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/darkice.cfg.5 \
+		${PREFIX}/man/man5/darkice.conf.5
+	for f in ${WRKSRC}/kdoc/*.html; do \
+		${INSTALL_DATA} $$f ${HTMLDIR}; \
+	done
+
+.include "../../audio/lame/buildlink2.mk"
+.include "../../audio/libvorbis/buildlink2.mk"
+
+.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/darkice/PLIST b/audio/darkice/PLIST
new file mode 100644
index 00000000000..5f800eeaba6
--- /dev/null
+++ b/audio/darkice/PLIST
@@ -0,0 +1,100 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/09 17:23:45 xtraeme Exp $
+bin/darkice
+man/man1/darkice.1
+man/man5/darkice.conf.5
+share/doc/html/darkice/AudioEncoder.html
+share/doc/html/darkice/AudioEncoder_h.html
+share/doc/html/darkice/AudioSource.html
+share/doc/html/darkice/AudioSource_h.html
+share/doc/html/darkice/BufferedSink.html
+share/doc/html/darkice/BufferedSink_h.html
+share/doc/html/darkice/CastSink.html
+share/doc/html/darkice/CastSink_h.html
+share/doc/html/darkice/Config.html
+share/doc/html/darkice/ConfigSection.html
+share/doc/html/darkice/ConfigSection_h.html
+share/doc/html/darkice/Config_h.html
+share/doc/html/darkice/Connector.html
+share/doc/html/darkice/Connector_h.html
+share/doc/html/darkice/DarkIce.html
+share/doc/html/darkice/DarkIce_h.html
+share/doc/html/darkice/Exception.html
+share/doc/html/darkice/Exception_h.html
+share/doc/html/darkice/FileCast.html
+share/doc/html/darkice/FileCast_h.html
+share/doc/html/darkice/FileSink.html
+share/doc/html/darkice/FileSink_h.html
+share/doc/html/darkice/IceCast.html
+share/doc/html/darkice/IceCast2.html
+share/doc/html/darkice/IceCast2_h.html
+share/doc/html/darkice/IceCast_h.html
+share/doc/html/darkice/LameLibEncoder.html
+share/doc/html/darkice/LameLibEncoder_h.html
+share/doc/html/darkice/MultiThreadedConnector.html
+share/doc/html/darkice/MultiThreadedConnector__ThreadData.html
+share/doc/html/darkice/MultiThreadedConnector_h.html
+share/doc/html/darkice/OssDspSource.html
+share/doc/html/darkice/OssDspSource_h.html
+share/doc/html/darkice/Ref.html
+share/doc/html/darkice/Ref_h.html
+share/doc/html/darkice/Referable.html
+share/doc/html/darkice/Referable_h.html
+share/doc/html/darkice/Reporter.html
+share/doc/html/darkice/Reporter_h.html
+share/doc/html/darkice/ShoutCast.html
+share/doc/html/darkice/ShoutCast_h.html
+share/doc/html/darkice/Sink.html
+share/doc/html/darkice/Sink_h.html
+share/doc/html/darkice/SolarisDspSource.html
+share/doc/html/darkice/SolarisDspSource_h.html
+share/doc/html/darkice/Source.html
+share/doc/html/darkice/Source_h.html
+share/doc/html/darkice/TcpSocket.html
+share/doc/html/darkice/TcpSocket_h.html
+share/doc/html/darkice/Util.html
+share/doc/html/darkice/Util_h.html
+share/doc/html/darkice/VorbisLibEncoder.html
+share/doc/html/darkice/VorbisLibEncoder_h.html
+share/doc/html/darkice/aflibConverter.html
+share/doc/html/darkice/aflibConverterLargeFilter_h.html
+share/doc/html/darkice/aflibConverterSmallFilter_h.html
+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-AudioEncoder.html
+share/doc/html/darkice/full-list-AudioSource.html
+share/doc/html/darkice/full-list-BufferedSink.html
+share/doc/html/darkice/full-list-CastSink.html
+share/doc/html/darkice/full-list-Config.html
+share/doc/html/darkice/full-list-ConfigSection.html
+share/doc/html/darkice/full-list-Connector.html
+share/doc/html/darkice/full-list-DarkIce.html
+share/doc/html/darkice/full-list-Exception.html
+share/doc/html/darkice/full-list-FileCast.html
+share/doc/html/darkice/full-list-FileSink.html
+share/doc/html/darkice/full-list-IceCast.html
+share/doc/html/darkice/full-list-IceCast2.html
+share/doc/html/darkice/full-list-LameLibEncoder.html
+share/doc/html/darkice/full-list-MultiThreadedConnector.html
+share/doc/html/darkice/full-list-MultiThreadedConnector__ThreadData.html
+share/doc/html/darkice/full-list-OssDspSource.html
+share/doc/html/darkice/full-list-Ref.html
+share/doc/html/darkice/full-list-Referable.html
+share/doc/html/darkice/full-list-Reporter.html
+share/doc/html/darkice/full-list-ShoutCast.html
+share/doc/html/darkice/full-list-Sink.html
+share/doc/html/darkice/full-list-SolarisDspSource.html
+share/doc/html/darkice/full-list-Source.html
+share/doc/html/darkice/full-list-TcpSocket.html
+share/doc/html/darkice/full-list-Util.html
+share/doc/html/darkice/full-list-VorbisLibEncoder.html
+share/doc/html/darkice/full-list-aflibConverter.html
+share/doc/html/darkice/full-list-aflibDebug.html
+share/doc/html/darkice/header-list.html
+share/doc/html/darkice/hier.html
+share/doc/html/darkice/index-long.html
+share/doc/html/darkice/index.html
+share/examples/darkice/darkice.conf.default
+@dirrm share/examples/darkice
+@dirrm share/doc/html/darkice
diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo
new file mode 100644
index 00000000000..eb9f8672f29
--- /dev/null
+++ b/audio/darkice/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/01/09 17:23:44 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
diff --git a/audio/darkice/patches/patch-aa b/audio/darkice/patches/patch-aa
new file mode 100644
index 00000000000..8613f64bc2d
--- /dev/null
+++ b/audio/darkice/patches/patch-aa
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..83532dd6f3d
--- /dev/null
+++ b/audio/darkice/patches/patch-ab
@@ -0,0 +1,143 @@
+$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
new file mode 100644
index 00000000000..cba316caf6d
--- /dev/null
+++ b/audio/darkice/patches/patch-ac
@@ -0,0 +1,13 @@
+$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\
diff --git a/doc/CHANGES b/doc/CHANGES
index 491f124d3e2..6c1ae73d394 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4403 2004/01/09 17:00:37 xtraeme Exp $
+$NetBSD: CHANGES,v 1.4404 2004/01/09 17:18:33 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -128,3 +128,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Added jday-1.3 [wennmach 2004-01-09]
 	Updated gd to 2.0.20 [adam 2004-01-09]
 	Removed bonobo-activation [xtraeme 2004-01-09]
+	Added darkice-0.13.2 [xtraeme 2004-01-09]