From 39db9bb39e5302c1a6773df8d129990304a45b2d Mon Sep 17 00:00:00 2001 From: hubertf Date: Tue, 21 Nov 2000 06:01:49 +0000 Subject: Add liveice-0.20001121: LiveIce is the source client for Icecast which encodes an mpeg stream for broadcast as it is created. Unlike clients such as Shout and IceDJ this permits the broadcast of live audio, rather than prerecorded mp3's. To start: 0. start icecast 1. find $HOME/mp3 -type f >playlist 2. liveiceconfigure.tk, save 3. In /bin/sh: liveice -M 2>/dev/null --- audio/liveice/Makefile | 34 ++++++++++++++++++++++++++++++++++ audio/liveice/files/md5 | 3 +++ audio/liveice/files/patch-sum | 11 +++++++++++ audio/liveice/patches/patch-aa | 14 ++++++++++++++ audio/liveice/patches/patch-ab | 16 ++++++++++++++++ audio/liveice/patches/patch-ac | 14 ++++++++++++++ audio/liveice/patches/patch-ad | 17 +++++++++++++++++ audio/liveice/patches/patch-ae | 25 +++++++++++++++++++++++++ audio/liveice/patches/patch-af | 13 +++++++++++++ audio/liveice/patches/patch-ag | 28 ++++++++++++++++++++++++++++ audio/liveice/patches/patch-ah | 15 +++++++++++++++ audio/liveice/patches/patch-ai | 13 +++++++++++++ audio/liveice/pkg/COMMENT | 1 + audio/liveice/pkg/DESCR | 10 ++++++++++ audio/liveice/pkg/PLIST | 8 ++++++++ 15 files changed, 222 insertions(+) create mode 100644 audio/liveice/Makefile create mode 100644 audio/liveice/files/md5 create mode 100644 audio/liveice/files/patch-sum create mode 100644 audio/liveice/patches/patch-aa create mode 100644 audio/liveice/patches/patch-ab create mode 100644 audio/liveice/patches/patch-ac create mode 100644 audio/liveice/patches/patch-ad create mode 100644 audio/liveice/patches/patch-ae create mode 100644 audio/liveice/patches/patch-af create mode 100644 audio/liveice/patches/patch-ag create mode 100644 audio/liveice/patches/patch-ah create mode 100644 audio/liveice/patches/patch-ai create mode 100644 audio/liveice/pkg/COMMENT create mode 100644 audio/liveice/pkg/DESCR create mode 100644 audio/liveice/pkg/PLIST (limited to 'audio') diff --git a/audio/liveice/Makefile b/audio/liveice/Makefile new file mode 100644 index 00000000000..3f0af64247d --- /dev/null +++ b/audio/liveice/Makefile @@ -0,0 +1,34 @@ +# $NetBSD: Makefile,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ +# + +DISTNAME= liveice +PKGNAME= liveice-0.20001121 +CATEGORIES= audio +MASTER_SITES= http://star.arm.ac.uk/~spm/software/ + +MAINTAINER= hubertf@netbsd.org +HOMEPAGE= http://star.arm.ac.uk/~spm/software/liveice.html + +DEPENDS+= mpg123-0.5*:../../audio/mpg123 +DEPENDS+= lame-3.*:../../audio/lame +DEPENDS+= tk-8.*:../../x11/tk + +GNU_CONFIGURE= YES +DIST_SUBDIR= liveice-0.20001121 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/liveice ${PREFIX}/bin + ( ${ECHO} '#!${LOCALBASE}/bin/wish' ; \ + ${TAIL} +2 ${WRKSRC}/liveiceconfigure.tk \ + ) >${PREFIX}/bin/liveiceconfigure.tk + ${CHGRP} ${BINGRP} ${PREFIX}/bin/liveiceconfigure.tk + ${CHOWN} ${BINOWN} ${PREFIX}/bin/liveiceconfigure.tk + ${CHMOD} ${BINMODE} ${PREFIX}/bin/liveiceconfigure.tk + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/liveice + for i in README.frontend README.liveice README.quickstart \ + README.xingmp3enc README_new_mixer.txt ; \ + do \ + ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/liveice ; \ + done + +.include "../../mk/bsd.pkg.mk" diff --git a/audio/liveice/files/md5 b/audio/liveice/files/md5 new file mode 100644 index 00000000000..6b791165f92 --- /dev/null +++ b/audio/liveice/files/md5 @@ -0,0 +1,3 @@ +$NetBSD: md5,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +MD5 (liveice-0.20001121/liveice.tar.gz) = 6b1c9c98225757c26f91083b233da0ff diff --git a/audio/liveice/files/patch-sum b/audio/liveice/files/patch-sum new file mode 100644 index 00000000000..ab8f34a3464 --- /dev/null +++ b/audio/liveice/files/patch-sum @@ -0,0 +1,11 @@ +$NetBSD: patch-sum,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +MD5 (patch-aa) = 7a55743a33dd3c84d6b93f04676a7efb +MD5 (patch-ab) = 0c5b71e3405da20c6538d58442db6651 +MD5 (patch-ac) = ffe01c00b462aaa4819b1e751f860af1 +MD5 (patch-ad) = 6ac9367eeebb2620bdd5a3258cb087a7 +MD5 (patch-ae) = e5b8f2b4e6cf36d9e8c1926c2213e912 +MD5 (patch-af) = c6e960ffa105e5bdb626b73f331f72f7 +MD5 (patch-ag) = fd1ec76e7a566d1361f90bd218ca48a5 +MD5 (patch-ah) = d31eedeb1a0a498b15c4278ff9cb7028 +MD5 (patch-ai) = ccff786a19ba7cb3bd29ef63a4e3d341 diff --git a/audio/liveice/patches/patch-aa b/audio/liveice/patches/patch-aa new file mode 100644 index 00000000000..12e8fa209bd --- /dev/null +++ b/audio/liveice/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +--- liveice.h.orig Tue Nov 21 03:29:51 2000 ++++ liveice.h +@@ -39,7 +39,9 @@ + #include + #include + #include ++#ifndef __NetBSD__ + #include ++#endif + #include + #include + #include diff --git a/audio/liveice/patches/patch-ab b/audio/liveice/patches/patch-ab new file mode 100644 index 00000000000..78de2701858 --- /dev/null +++ b/audio/liveice/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +--- streams.c.orig Tue Nov 21 03:30:12 2000 ++++ streams.c +@@ -36,7 +36,11 @@ + #ifdef HAVE_SYS_SOUNDCARD_H + #include + #else ++#ifdef __NetBSD__ ++#include ++#else + #include ++#endif /* __NetBSD__ */ + #endif + #endif + #include diff --git a/audio/liveice/patches/patch-ac b/audio/liveice/patches/patch-ac new file mode 100644 index 00000000000..a3944770f75 --- /dev/null +++ b/audio/liveice/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +--- Makefile.in.orig Tue Nov 21 03:31:42 2000 ++++ Makefile.in +@@ -1,6 +1,9 @@ + CC = @CC@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LIBS@ ++.if ${OPSYS} == "NetBSD" ++LDFLAGS+= -lossaudio # Not needed on Solaris ++.endif + SHELL=/bin/sh + + srcdir = @srcdir@ diff --git a/audio/liveice/patches/patch-ad b/audio/liveice/patches/patch-ad new file mode 100644 index 00000000000..8c0004387d9 --- /dev/null +++ b/audio/liveice/patches/patch-ad @@ -0,0 +1,17 @@ +$NetBSD: patch-ad,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +--- configure.orig Tue Nov 21 03:37:00 2000 ++++ configure +@@ -536,9 +536,9 @@ + LOGDIR="/var/log/icecast" + else + echo "FSSTD DISABLED" +- BINDIR="${prefix}/icecast/bin" +- ETCDIR="${prefix}/icecast/etc" +- LOGDIR="${prefix}/icecast/log" ++ BINDIR="${prefix}/bin" ++ ETCDIR="${prefix}/etc" ++ LOGDIR="/var/log/icecast" + fi + + diff --git a/audio/liveice/patches/patch-ae b/audio/liveice/patches/patch-ae new file mode 100644 index 00000000000..0e604d3648d --- /dev/null +++ b/audio/liveice/patches/patch-ae @@ -0,0 +1,25 @@ +$NetBSD: patch-ae,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +--- setup.c.orig Wed May 24 15:50:02 2000 ++++ setup.c +@@ -38,7 +38,11 @@ + char default_mountpoint[] = "liveice"; + char default_description[] = "LiveIce"; + char default_pipe_directory[] = ".liveice_temp_files"; ++#ifdef __NetBSD__ ++char default_sound_input_file[] = "/dev/sound"; ++#else + char default_sound_input_file[] = "/dev/dsp"; ++#endif + + /* default encoder commands */ + char AJ_encoder_command[] = "encoder"; +@@ -46,7 +50,7 @@ + char MP3ENC_encoder_command[] = "mp3enc"; + char SCREAMER_encoder_command[] = "lamer"; + char XING_encoder_command[] = "xingmp3enc"; +-char LAME3_encoder_command[] = "lame3"; ++char LAME3_encoder_command[] = "lame"; + char GOGO_encoder_command[] = "gogo"; + + static int in_stream_set; diff --git a/audio/liveice/patches/patch-af b/audio/liveice/patches/patch-af new file mode 100644 index 00000000000..126c0f28286 --- /dev/null +++ b/audio/liveice/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +--- liveiceconfigure.tk.orig Tue Nov 21 04:01:33 2000 ++++ liveiceconfigure.tk +@@ -60,7 +60,7 @@ + L3ENC { .f11.enc insert 0 "l3enc" } + MP3ENC { .f11.enc insert 0 "mp3enc" } + SCREAMER { .f11.enc insert 0 "lamer" } +- LAME3 { .f11.enc insert 0 "lame3" } ++ LAME3 { .f11.enc insert 0 "lame" } + XING { .f11.enc insert 0 "xingmp3enc" } + XING_VBR { .f11.enc insert 0 "xingmp3enc" } + default { .f11.enc insert 0 "encoder" } diff --git a/audio/liveice/patches/patch-ag b/audio/liveice/patches/patch-ag new file mode 100644 index 00000000000..41205d20e8f --- /dev/null +++ b/audio/liveice/patches/patch-ag @@ -0,0 +1,28 @@ +$NetBSD: patch-ag,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +--- get_local_stream.c.orig Tue Nov 21 04:03:45 2000 ++++ get_local_stream.c +@@ -77,7 +77,11 @@ + #ifdef SOUNDCARD_SUPPORT + fprintf(stderr,"Initialising Soundcard\n"); + ++#ifdef __NetBSD__ ++ if((g_conf.audio_fd=open("/dev/sound",O_RDWR))==-1) ++#else + if((g_conf.audio_fd=open("/dev/dsp",O_RDWR))==-1) ++#endif + fatal("Failed to open sound device"); + + /* see if the card can do full_duplex */ +@@ -134,7 +138,11 @@ + #ifdef SOUNDCARD_SUPPORT + write_message("Opening Soundcard",1); + ++#ifdef __NetBSD__ ++ if((g_conf.audio_fd=open("/dev/sound",flags))==-1) ++#else + if((g_conf.audio_fd=open("/dev/dsp",flags))==-1) ++#endif + fatal("Failed to open sound device"); + + if(g_conf.full_duplex) diff --git a/audio/liveice/patches/patch-ah b/audio/liveice/patches/patch-ah new file mode 100644 index 00000000000..269d01fb2d7 --- /dev/null +++ b/audio/liveice/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +--- playlist.c.orig Tue Nov 21 04:43:42 2000 ++++ playlist.c +@@ -130,6 +130,10 @@ + int i,r_type=MISC_AUDIO; + + extn=strrchr(trackname,'.'); ++ ++ if (extn == NULL) ++ return MISC_AUDIO; ++ + lcext=malloc(strlen(extn)+2); + i=0; + while(extn[i]!=0){ diff --git a/audio/liveice/patches/patch-ai b/audio/liveice/patches/patch-ai new file mode 100644 index 00000000000..24099d980e4 --- /dev/null +++ b/audio/liveice/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ + +--- mixer.c.orig Tue May 30 13:30:56 2000 ++++ mixer.c +@@ -70,7 +70,7 @@ + if(*new==NULL){ + sprintf(mesg,"Adding New Channel %s",name); + write_message(mesg,0); +- *new=malloc(sizeof(channel)); ++ *new=calloc(1, sizeof(channel)); + strncpy((*new)->name,name,63); + (*new)->curnt=mixer.t_list; + (*new)->volume=1.0; diff --git a/audio/liveice/pkg/COMMENT b/audio/liveice/pkg/COMMENT new file mode 100644 index 00000000000..07a488eac74 --- /dev/null +++ b/audio/liveice/pkg/COMMENT @@ -0,0 +1 @@ +Source client for Icecast diff --git a/audio/liveice/pkg/DESCR b/audio/liveice/pkg/DESCR new file mode 100644 index 00000000000..0275dcf705d --- /dev/null +++ b/audio/liveice/pkg/DESCR @@ -0,0 +1,10 @@ +LiveIce is the source client for Icecast which encodes an mpeg +stream for broadcast as it is created. Unlike clients such as Shout +and IceDJ this permits the broadcast of live audio, rather than +prerecorded mp3's. + +To start: + 0. start icecast + 1. find $HOME/mp3 -type f >playlist + 2. liveiceconfigure.tk, save + 3. In /bin/sh: liveice -M 2>/dev/null diff --git a/audio/liveice/pkg/PLIST b/audio/liveice/pkg/PLIST new file mode 100644 index 00000000000..936b4859ce8 --- /dev/null +++ b/audio/liveice/pkg/PLIST @@ -0,0 +1,8 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/21 06:01:49 hubertf Exp $ +bin/liveice +bin/liveiceconfigure.tk +share/doc/liveice/README.frontend +share/doc/liveice/README.liveice +share/doc/liveice/README.quickstart +share/doc/liveice/README.xingmp3enc +share/doc/liveice/README_new_mixer.txt -- cgit v1.2.3