Date: Wed, 7 Apr 1999 00:11:52 -0700 (PDT) From: mharo@area51.fremont.ca.us To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10994: Update: audio/icecast (1.1.0 -> 1.1.3) Message-ID: <199904070711.AAA25702@patrol.area51.fremont.ca.us>
next in thread | raw e-mail | index | archive | help
>Number: 10994 >Category: ports >Synopsis: Update: audio/icecast (1.1.0 -> 1.1.3) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 7 00:20:00 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Michael Haro >Release: FreeBSD 3.1-STABLE i386 >Organization: >Environment: >Description: Changes: - New version (1.1.0 -> 1.1.3) portlint: 0 warnings, 0 errors patches: 3 new, 0 removed new: patch-aa, patch-ab, patch-ac supports PREFIX: yes supports CFLAGS: yes >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /host/trang.nuxi.com/FBSD/CVS-repository/ports/audio/icecast/Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile --- Makefile 1999/04/02 04:23:49 1.1.1.1 +++ Makefile 1999/04/07 06:38:45 @@ -6,7 +6,7 @@ # $Id: Makefile,v 1.1.1.1 1999/04/02 04:23:49 steve Exp $ # -DISTNAME= icecast-1.1.0 +DISTNAME= icecast-1.1.3 CATEGORIES= audio net MASTER_SITES= http://icecast.linuxpower.org/releases/ \ ftp://ftp.eboai.org/pub/icecast/ @@ -14,19 +14,22 @@ MAINTAINER= chip@eboai.org GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-crypt --with-libwrap do-install: ${INSTALL_PROGRAM} ${WRKSRC}/icecast ${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/iceplay/listen ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/iceplay/shout ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/iceplay/iceplay ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/liveice/liveice ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/shout/listen ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/shout/shout ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/misc/iceplay ${PREFIX}/bin .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/icecast ${INSTALL_MAN} ${WRKSRC}/doc/* ${PREFIX}/share/doc/icecast ${MKDIR} ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/iceplay/shoutrc.example ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/iceplay/playlist.example ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/iceplay/radio.tcl.example ${PREFIX}/share/examples/icecast + ${INSTALL_MAN} ${WRKSRC}/shout/shoutrc.example ${PREFIX}/share/examples/icecast + ${INSTALL_MAN} ${WRKSRC}/shout/playlist.example ${PREFIX}/share/examples/icecast + ${INSTALL_MAN} ${WRKSRC}/shout/radio.tcl.example ${PREFIX}/share/examples/icecast + ${INSTALL_MAN} ${WRKSRC}/liveice/liveice.cfg ${PREFIX}/share/examples/icecast ${MKDIR} ${PREFIX}/share/examples/icecast/icedir ${INSTALL_MAN} ${WRKSRC}/icedir/* ${PREFIX}/share/examples/icecast/icedir .endif Index: files/md5 =================================================================== RCS file: /host/trang.nuxi.com/FBSD/CVS-repository/ports/audio/icecast/files/md5,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 md5 --- md5 1999/04/02 04:23:49 1.1.1.1 +++ md5 1999/04/04 22:23:49 @@ -1 +1 @@ -MD5 (icecast-1.1.0.tar.gz) = f0bd176b2aea0583716a5ab110472213 +MD5 (icecast-1.1.3.tar.gz) = 986afc6e343b6bce159ff267e6f7120d Index: pkg/PLIST =================================================================== RCS file: /host/trang.nuxi.com/FBSD/CVS-repository/ports/audio/icecast/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- PLIST 1999/04/02 04:23:49 1.1.1.1 +++ PLIST 1999/04/07 06:40:01 @@ -1,7 +1,8 @@ -sbin/icecast bin/iceplay -bin/shout bin/listen +bin/liveice +bin/shout +sbin/icecast share/doc/icecast/AUTHORS share/doc/icecast/BUGS share/doc/icecast/BUGS.iceplay @@ -16,6 +17,7 @@ share/doc/icecast/README.shout share/doc/icecast/TESTED share/doc/icecast/TODO.shout +share/examples/icecast/liveice.cfg share/examples/icecast/playlist.example share/examples/icecast/radio.tcl.example share/examples/icecast/shoutrc.example **** PATCHES **** *** patch-aa *** --- liveice/get_local_stream.c.orig Sat Mar 6 02:02:46 1999 +++ liveice/get_local_stream.c Tue Apr 6 09:17:52 1999 @@ -26,7 +26,7 @@ #include "liveice.h" #include "serverlib.h" -#include <sys/soundcard.h> +#include <machine/soundcard.h> #include <sys/ioctl.h> #define BUF_LENGTH 256 @@ -70,7 +70,9 @@ if(g_conf.full_duplex){ ioctl(g_conf.audio_fd, SNDCTL_DSP_GETCAPS, &caps); if(caps & DSP_CAP_DUPLEX){ + #ifndef __FreeBSD__ ioctl(g_conf.audio_fd, SNDCTL_DSP_SETDUPLEX, 0); + #endif } else { write_message("Sound Card Driver Can't Do Full Duplex",0); @@ -113,7 +115,9 @@ fatal("Failed to open sound device"); if(g_conf.full_duplex) + #ifndef __FreeBSD__ ioctl(g_conf.audio_fd, SNDCTL_DSP_SETDUPLEX, 0); + #endif format = AFMT_S16_LE; if(ioctl(g_conf.audio_fd,SNDCTL_DSP_SETFMT,&format)==-1) *** patch-ab *** --- liveice/mixer.c.orig Tue Apr 6 09:20:31 1999 +++ liveice/mixer.c Tue Apr 6 19:44:27 1999 @@ -23,7 +23,7 @@ #include "mixer.h" #include "liveice.h" -#include <sys/soundcard.h> +#include <machine/soundcard.h> #include <time.h> extern void init_channel_display(cptr ch); @@ -143,7 +143,7 @@ ch->rate=rate; ch->channels=channels; if(rate>0){ - sprintf(mesg,"%6dkHz %2d Ch %s",ch->rate,ch->channels,basename(ch->curnt->filename)); + sprintf(mesg,"%6dkHz %2d Ch %s",ch->rate,ch->channels,strrchr(ch->curnt->filename, '/') ? : ch->curnt->filename); write_message(mesg,0); } else { sprintf(mesg,"Unable to play %s",name); *** patch-ac *** --- Makefile.in.orig Tue Apr 6 23:29:38 1999 +++ Makefile.in Tue Apr 6 23:29:46 1999 @@ -45,10 +45,10 @@ icecast: $(OBJS) $(CC) $(COMPILE_CFLAGS) -o icecast $(OBJS) $(LDFLAGS) -shout: +shout:: @cd shout; $(MAKE) -live: +live:: @cd liveice; $(MAKE) mkpasswd: mkpasswd.c >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199904070711.AAA25702>