From c422afbe87c53e1fc5d798ed61dcdbe8c9fdedad Mon Sep 17 00:00:00 2001 From: Kiriyama Kazuhiko Date: Thu, 7 Jun 2001 02:00:57 +0000 Subject: New port for RAT(network audio tool) version 3. PR: 21356 Submitted by:Takeshi MUTOH --- mbone/rat30/Makefile | 30 +++++++++++++ mbone/rat30/distinfo | 2 + mbone/rat30/files/patch-Makefile | 10 +++++ mbone/rat30/files/patch-Makefile_FreeBSD_4 | 9 ++++ mbone/rat30/files/patch-aa | 69 ++++++++++++++++++++++++++++++ mbone/rat30/files/patch-ac | 53 +++++++++++++++++++++++ mbone/rat30/pkg-comment | 1 + mbone/rat30/pkg-descr | 22 ++++++++++ mbone/rat30/pkg-plist | 2 + 9 files changed, 198 insertions(+) create mode 100644 mbone/rat30/Makefile create mode 100644 mbone/rat30/distinfo create mode 100644 mbone/rat30/files/patch-Makefile create mode 100644 mbone/rat30/files/patch-Makefile_FreeBSD_4 create mode 100644 mbone/rat30/files/patch-aa create mode 100644 mbone/rat30/files/patch-ac create mode 100644 mbone/rat30/pkg-comment create mode 100644 mbone/rat30/pkg-descr create mode 100644 mbone/rat30/pkg-plist (limited to 'mbone/rat30') diff --git a/mbone/rat30/Makefile b/mbone/rat30/Makefile new file mode 100644 index 000000000000..297f37d0be7f --- /dev/null +++ b/mbone/rat30/Makefile @@ -0,0 +1,30 @@ +# New ports collection makefile for: rat +# Date created: 6 June 2001 +# Whom: anton +# +# $FreeBSD$ +# + +PORTNAME= rat +PORTVERSION= 3.0.35 +CATEGORIES= mbone audio +MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/${PORTVERSION}/ + +MAINTAINER= anton@urc.ac.ru + +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 + +WRKSRC= ${WRKDIR}/rat-3.0 + +USE_GMAKE= yes +MAN1= rat.1 +MANCOMPRESSED= no + +do-build: + (cd ${WRKSRC};${SETENV} MAKE=${GMAKE} ${SH} ./Build rat) + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/bin/rat ${PREFIX}/bin/rat30 + ${INSTALL_MAN} ${WRKSRC}/man/man1/rat.1 ${PREFIX}/man/man1 + +.include diff --git a/mbone/rat30/distinfo b/mbone/rat30/distinfo new file mode 100644 index 000000000000..cc2b2e3debbc --- /dev/null +++ b/mbone/rat30/distinfo @@ -0,0 +1,2 @@ +MD5 (rat-3.0.35.tar.gz) = fff6e4a4c9617c5b7ea80f63fda96a9a +MD5 (rat-3.0.35.tar.gz) = fff6e4a4c9617c5b7ea80f63fda96a9a diff --git a/mbone/rat30/files/patch-Makefile b/mbone/rat30/files/patch-Makefile new file mode 100644 index 000000000000..4eaebd1f3efd --- /dev/null +++ b/mbone/rat30/files/patch-Makefile @@ -0,0 +1,10 @@ +--- Makefile.orig Tue Sep 14 19:39:00 1999 ++++ Makefile Thu May 10 11:07:38 2001 +@@ -82,6 +82,7 @@ + $(BINDIR)/rat-$(OSTYPE)-$(OSVERS): $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(RATOBJS) + rm -f $(BINDIR)/rat-$(OSTYPE)-$(OSVERS) + $(CC) $(RATOBJS) $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(LDLIBS) $(LDFLAGS) -o $(BINDIR)/rat-$(OSTYPE)-$(OSVERS) ++ cp $(BINDIR)/rat-$(OSTYPE)-$(OSVERS) bin/rat + + $(OBJDIR)/%.o: $(SRCDIR)/%.c + $(CC) $(CFLAGS) $(GSMFLAGS) $(CRYPTFLAGS) -c $(SRCDIR)/$*.c -o $(OBJDIR)/$*.o diff --git a/mbone/rat30/files/patch-Makefile_FreeBSD_4 b/mbone/rat30/files/patch-Makefile_FreeBSD_4 new file mode 100644 index 000000000000..36c4e87a95d7 --- /dev/null +++ b/mbone/rat30/files/patch-Makefile_FreeBSD_4 @@ -0,0 +1,9 @@ +--- Makefile_FreeBSD_4.org Mon May 7 13:07:46 2001 ++++ Makefile_FreeBSD_4 Mon May 7 13:03:51 2001 +@@ -0,0 +1,6 @@ ++TCL_INC = /usr/local/include/tcl8.2 ++TK_INC = /usr/local/include/tk8.2 ++INCS = -I/usr/X11R6/include \ ++ -I$(TCL_INC)/generic -I$(TK_INC)/generic ++LDLIBS = -L/usr/local/lib \ ++ -L/usr/X11R6/lib -ltk82 -ltcl82 -lXext -lX11 -lm diff --git a/mbone/rat30/files/patch-aa b/mbone/rat30/files/patch-aa new file mode 100644 index 000000000000..83e874042ceb --- /dev/null +++ b/mbone/rat30/files/patch-aa @@ -0,0 +1,69 @@ +*** src/auddev_freebsd.c.orig Wed Mar 24 16:22:19 1999 +--- src/auddev_freebsd.c Sat Sep 16 00:03:22 2000 +*************** +*** 89,102 **** + } + if ((ioctl(audio_fd, SNDCTL_DSP_SETFMT, &mode) == -1) || (mode != AFMT_S16_LE)) { + printf("Device doesn't support 16bit linear format!\n"); + return -1; + } + if ((ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo) == -1) || (stereo != 0)) { + printf("Device doesn't support mono!\n"); + return -1; + } +! if ((ioctl(audio_fd, SNDCTL_DSP_SPEED, &speed) == -1) || (speed != 8000)) { + printf("Device doesn't support 8kHz sampling!\n"); + return -1; + } + +--- 89,106 ---- + } + if ((ioctl(audio_fd, SNDCTL_DSP_SETFMT, &mode) == -1) || (mode != AFMT_S16_LE)) { + printf("Device doesn't support 16bit linear format!\n"); ++ close(audio_fd); + return -1; + } + if ((ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo) == -1) || (stereo != 0)) { + printf("Device doesn't support mono!\n"); ++ close(audio_fd); + return -1; + } +! // if ((ioctl(audio_fd, SNDCTL_DSP_SPEED, &speed) == -1) || (speed != 8000)) { +! if (ioctl(audio_fd, SNDCTL_DSP_SPEED, &speed) == -1){ + printf("Device doesn't support 8kHz sampling!\n"); ++ close(audio_fd); + return -1; + } + +*************** +*** 158,163 **** +--- 162,168 ---- + * be open to do this, so if we're passed -1 as a file-descriptor we open + * the device, do the ioctl, and then close it again... + */ ++ /* + snd_chan_param scp; + if (audio_fd == -1) { + audio_fd = audio_open_rw(O_RDONLY); +*************** +*** 174,179 **** +--- 179,197 ---- + if (ioctl(audio_fd, AIOSFMT, 0) == -1) { + return FALSE; + } ++ */ ++ int caps; ++ int was_defined = 1; ++ if (audio_fd == -1) { ++ audio_fd = audio_open_rw(O_RDWR); ++ was_defined = 0; ++ } ++ ioctl(audio_fd, SNDCTL_DSP_GETCAPS, &caps); ++ if ((caps & DSP_CAP_DUPLEX) == 0) { ++ if( was_defined == 0 ) audio_close(audio_fd); ++ return FALSE; ++ } ++ if( was_defined == 0 ) audio_close(audio_fd); + return TRUE; + } + diff --git a/mbone/rat30/files/patch-ac b/mbone/rat30/files/patch-ac new file mode 100644 index 000000000000..4b8e62270300 --- /dev/null +++ b/mbone/rat30/files/patch-ac @@ -0,0 +1,53 @@ +--- src/auddev_freebsd.c.p1 Mon Sep 18 10:27:40 2000 ++++ src/auddev_freebsd.c Mon Sep 18 10:30:42 2000 +@@ -204,18 +204,10 @@ + if (audio_fd <= 0) { + return; + } +- switch (iport) { +- case AUDIO_MICROPHONE : if (ioctl(audio_fd, MIXER_WRITE(SOUND_MIXER_MIC), &volume) == -1) { +- perror("Setting gain"); +- } +- return; +- case AUDIO_LINE_IN : if (ioctl(audio_fd, MIXER_WRITE(SOUND_MIXER_LINE), &volume) == -1) { +- perror("Setting gain"); +- } +- return; ++ if (ioctl(audio_fd, SOUND_MIXER_WRITE_RECLEV, &volume) == -1) { ++ perror("Setting gain"); + } +- printf("ERROR: Unknown iport in audio_set_gain!\n"); +- abort(); ++ return; + } + + int +@@ -226,17 +218,8 @@ + if (audio_fd <= 0) { + return (0); + } +- switch (iport) { +- case AUDIO_MICROPHONE : if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_MIC), &volume) == -1) { +- perror("Getting gain"); +- } +- break; +- case AUDIO_LINE_IN : if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_LINE), &volume) == -1) { +- perror("Getting gain"); +- } +- break; +- default : printf("ERROR: Unknown iport in audio_set_gain!\n"); +- abort(); ++ if (ioctl(audio_fd, SOUND_MIXER_READ_RECLEV, &volume) == -1) { ++ perror("Setting gain"); + } + return device_to_bat(volume & 0xff); + } +@@ -263,7 +246,7 @@ + if (audio_fd <= 0) { + return (0); + } +- if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_VOLUME), &volume) == -1) { ++ if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_PCM), &volume) == -1) { + perror("Getting volume"); + } + return device_to_bat(volume & 0x000000ff); /* Extract left channel volume */ diff --git a/mbone/rat30/pkg-comment b/mbone/rat30/pkg-comment new file mode 100644 index 000000000000..abcb956e03eb --- /dev/null +++ b/mbone/rat30/pkg-comment @@ -0,0 +1 @@ +IPv4/v6 Multicast and unicast audio conferencing tool diff --git a/mbone/rat30/pkg-descr b/mbone/rat30/pkg-descr new file mode 100644 index 000000000000..988875e9800a --- /dev/null +++ b/mbone/rat30/pkg-descr @@ -0,0 +1,22 @@ +RAT is a network audio tool that allows users to particpate in +audio conferences over the internet. These can be between two +participants directly, or between a group of participants on a +common multicast group. RAT features sender based loss mitigation +mechanisms and receiver based audio repair techniques to compensate +for packet loss, and load adaption in response to host performance. + +This is a stable branch version. Works with half-duplex casrd as well. +This is required mbone/relate. + +WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/ +RAT is a network audio tool that allows users to particpate in +audio conferences over the internet. These can be between two +participants directly, or between a group of participants on a +common multicast group. RAT features sender based loss mitigation +mechanisms and receiver based audio repair techniques to compensate +for packet loss, and load adaption in response to host performance. + +This is a stable branch version. Works with half-duplex casrd as well. +This is required mbone/relate. + +WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/ diff --git a/mbone/rat30/pkg-plist b/mbone/rat30/pkg-plist new file mode 100644 index 000000000000..ee354e40c4e4 --- /dev/null +++ b/mbone/rat30/pkg-plist @@ -0,0 +1,2 @@ +bin/rat30 +bin/rat30 -- cgit v1.2.3