diff options
author | hubertf <hubertf@pkgsrc.org> | 2000-11-21 06:01:49 +0000 |
---|---|---|
committer | hubertf <hubertf@pkgsrc.org> | 2000-11-21 06:01:49 +0000 |
commit | 39db9bb39e5302c1a6773df8d129990304a45b2d (patch) | |
tree | a926f7786d38c84d725a9e868d36d6612f44408c /audio/liveice/patches | |
parent | 59da6815d71eb0a64703798038d16d46b6dcae10 (diff) | |
download | pkgsrc-39db9bb39e5302c1a6773df8d129990304a45b2d.tar.gz |
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
Diffstat (limited to 'audio/liveice/patches')
-rw-r--r-- | audio/liveice/patches/patch-aa | 14 | ||||
-rw-r--r-- | audio/liveice/patches/patch-ab | 16 | ||||
-rw-r--r-- | audio/liveice/patches/patch-ac | 14 | ||||
-rw-r--r-- | audio/liveice/patches/patch-ad | 17 | ||||
-rw-r--r-- | audio/liveice/patches/patch-ae | 25 | ||||
-rw-r--r-- | audio/liveice/patches/patch-af | 13 | ||||
-rw-r--r-- | audio/liveice/patches/patch-ag | 28 | ||||
-rw-r--r-- | audio/liveice/patches/patch-ah | 15 | ||||
-rw-r--r-- | audio/liveice/patches/patch-ai | 13 |
9 files changed, 155 insertions, 0 deletions
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 <signal.h> + #include <netdb.h> + #include <arpa/inet.h> ++#ifndef __NetBSD__ + #include <sched.h> ++#endif + #include <unistd.h> + #include <termios.h> + #include <sys/wait.h> 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 <sys/soundcard.h> + #else ++#ifdef __NetBSD__ ++#include <soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif /* __NetBSD__ */ + #endif + #endif + #include <sys/ioctl.h> 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; |