upgrade to speak freely 7.0
This commit is contained in:
brad
parent
4a98616c06
commit
c619b52c98
@ -1,38 +1,34 @@
|
|||||||
# $OpenBSD: Makefile,v 1.3 1999/01/16 04:30:40 angelos Exp $
|
# $OpenBSD: Makefile,v 1.4 1999/06/20 21:05:35 brad Exp $
|
||||||
#
|
|
||||||
|
|
||||||
DISTNAME= speak_freely-6.1e
|
DISTNAME= speak_freely-7.0
|
||||||
CATEGORIES= mbone audio security
|
CATEGORIES= mbone audio security
|
||||||
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/
|
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/
|
||||||
|
|
||||||
MAINTAINER= angelos@openbsd.org
|
MAINTAINER= angelos@openbsd.org
|
||||||
|
|
||||||
|
LIB_DEPENDS= gsm.1.0:${PORTSDIR}/audio/gsm
|
||||||
|
|
||||||
UTILS= sfspeaker sfmike sflwl
|
UTILS= sfspeaker sfmike sflwl
|
||||||
DEMNS= sfecho sflwld
|
DEMNS= sfecho sflwld
|
||||||
DDEMNS= sfvod sfreflect
|
DDEMNS= sfvod sfreflect
|
||||||
SFLIB= ${PREFIX}/lib/speak_freely
|
SFLIB= ${PREFIX}/lib/speak_freely
|
||||||
MAN1= ${UTILS:S/$/.1/} ${DEMNS:S/$/.1/} ${DDEMNS:S/$/.1/}
|
|
||||||
|
|
||||||
do-install:
|
do-install:
|
||||||
if [ ! -d ${SFLIB} ]; then \
|
@if [ ! -d ${SFLIB} ]; then \
|
||||||
install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${SFLIB}; \
|
install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${SFLIB}; \
|
||||||
fi
|
fi
|
||||||
cd ${WRKSRC}; \
|
@$(INSTALL_DATA) ${WRKSRC}/busy.au ${WRKSRC}/ring.au ${SFLIB}
|
||||||
$(INSTALL_DATA) busy.au ring.au ${SFLIB}
|
@for p in ${UTILS}; do \
|
||||||
cd ${WRKSRC}; \
|
$(INSTALL_PROGRAM) ${WRKSRC}/$$p ${PREFIX}/bin; \
|
||||||
for p in ${UTILS}; do \
|
$(INSTALL_MAN) ${WRKSRC}/$$p.1 ${PREFIX}/man/man1; \
|
||||||
$(INSTALL_PROGRAM) $$p ${PREFIX}/bin; \
|
|
||||||
$(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \
|
|
||||||
done;
|
done;
|
||||||
cd ${WRKSRC}; \
|
@for p in ${DEMNS}; do \
|
||||||
for p in ${DEMNS}; do \
|
$(INSTALL_PROGRAM) ${WRKSRC}/$$p ${PREFIX}/sbin; \
|
||||||
$(INSTALL_PROGRAM) $$p ${PREFIX}/sbin; \
|
$(INSTALL_MAN) ${WRKSRC}/$$p.1 ${PREFIX}/man/man1; \
|
||||||
$(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \
|
|
||||||
done;
|
done;
|
||||||
cd ${WRKSRC}; \
|
@for p in ${DDEMNS}; do \
|
||||||
for p in ${DDEMNS}; do \
|
$(INSTALL_SCRIPT) ${WRKSRC}/$$p ${PREFIX}/sbin; \
|
||||||
$(INSTALL_SCRIPT) $$p ${PREFIX}/sbin; \
|
$(INSTALL_MAN) ${WRKSRC}/$$p.1 ${PREFIX}/man/man1; \
|
||||||
$(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \
|
|
||||||
done;
|
done;
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
MD5 (speak_freely-6.1e.tar.gz) = cabc5976a082cf6707304fc799691b94
|
MD5 (speak_freely-7.0.tar.gz) = 4f78734809d961c036b6491b1a7fd229
|
||||||
RMD160 (speak_freely-6.1e.tar.gz) = dbcf4bfe948cc80e52cf40c079197d0c60e6902b
|
RMD160 (speak_freely-7.0.tar.gz) = 6277c2d14a64dad7afb19236476af9b158f94c56
|
||||||
SHA1 (speak_freely-6.1e.tar.gz) = 46b1bcbee5f3e12d8d6b9c8c495de50f4c20f93c
|
SHA1 (speak_freely-7.0.tar.gz) = 20bbaf98bba666356507ffb230b7f6d1e3b116ec
|
||||||
|
|||||||
@ -1,91 +1,106 @@
|
|||||||
*** Makefile.orig Fri Jan 15 22:57:47 1999
|
--- Makefile.orig Sun May 2 10:38:44 1999
|
||||||
--- Makefile Fri Jan 15 23:02:03 1999
|
+++ Makefile Sat Jun 19 22:55:17 1999
|
||||||
***************
|
@@ -3,8 +3,8 @@
|
||||||
*** 21,28 ****
|
|
||||||
# option may speed up certain compression modes. If you get a
|
# Debugging options
|
||||||
# warning about -float being ignored in non -cckr compiles, it
|
|
||||||
# has no effect on your system.
|
-DEBUG = -g -DHEXDUMP
|
||||||
! CC = cc -signed
|
-#DEBUG = -O
|
||||||
! LFLAGS = -laudio -lcurses -lm
|
+#DEBUG = -g -DHEXDUMP
|
||||||
|
+DEBUG =
|
||||||
# SunOS 4.1.x
|
|
||||||
#CC = cc -fsingle -DOLDCC
|
# Uncomment the appropriate LFLAGS statement below according
|
||||||
--- 21,28 ----
|
# to your machine type.
|
||||||
# option may speed up certain compression modes. If you get a
|
@@ -26,8 +26,8 @@
|
||||||
# warning about -float being ignored in non -cckr compiles, it
|
# option may speed up certain compression modes. If you get a
|
||||||
# has no effect on your system.
|
# warning about -float being ignored in non -cckr compiles, it
|
||||||
! #CC = cc -signed
|
# has no effect on your system.
|
||||||
! #LFLAGS = -laudio -lcurses -lm
|
-CC = cc -signed
|
||||||
|
-LFLAGS = -laudio -lcurses -lm
|
||||||
# SunOS 4.1.x
|
+#CC = cc -signed
|
||||||
#CC = cc -fsingle -DOLDCC
|
+#LFLAGS = -laudio -lcurses -lm
|
||||||
***************
|
|
||||||
*** 52,59 ****
|
# ** Linux users please note: many Linux audio drivers are
|
||||||
# Depending on how your driver handles non-blocking I/O,
|
# half-duplex, even through your sound card may actually
|
||||||
# you may also have to add -DAUDIO_BLOCKING to the
|
@@ -108,12 +108,15 @@
|
||||||
# CCFLAGS line.
|
#CCFLAGS = -DHEWLETT_PACKARD -DOLDCC
|
||||||
! #CCFLAGS = -DM_LITTLE_ENDIAN
|
#LFLAGS = -lAlib -lcurses -ltermcap -lm
|
||||||
! #LFLAGS = -lcurses -ltermcap -lcompat -lm
|
|
||||||
|
+# OpenBSD
|
||||||
# ** Linux users please note: many Linux audio drivers are
|
+LFLAGS = -L${LOCALBASE}/lib -lcurses -ltermcap -lcompat -lm -lossaudio
|
||||||
# half-duplex, even through your sound card may actually
|
+
|
||||||
--- 52,60 ----
|
# Where Perl is located on your system. This is used to make
|
||||||
# Depending on how your driver handles non-blocking I/O,
|
# a directly-executable version of sfvod.
|
||||||
# you may also have to add -DAUDIO_BLOCKING to the
|
-PERL = /usr/local/bin/perl
|
||||||
# CCFLAGS line.
|
+PERL = /usr/bin/perl
|
||||||
! PREFIX=/usr/local
|
|
||||||
! CCFLAGS = -DM_LITTLE_ENDIAN
|
# If your audio hardware is half duplex, uncomment the next line
|
||||||
! LFLAGS = -lcurses -ltermcap -lcompat -lm -lossaudio
|
-#DUPLEX = -DHALF_DUPLEX
|
||||||
|
+DUPLEX = -DHALF_DUPLEX
|
||||||
# ** Linux users please note: many Linux audio drivers are
|
|
||||||
# half-duplex, even through your sound card may actually
|
# If your getdomainname() does not return the DNS domainname, define:
|
||||||
***************
|
#DOMAIN=-DMYDOMAIN=\"somedomain.net\"
|
||||||
*** 98,107 ****
|
@@ -141,7 +144,7 @@
|
||||||
|
|
||||||
# Where Perl is located on your system. This is used to make
|
# Compiler flags
|
||||||
# a directly-executable version of sfvod.
|
|
||||||
! PERL = /usr/local/bin/perl
|
-CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
||||||
|
+CFLAGS += $(DEBUG) -Iadpcm -Ilpc -Iidea -Imd5 -Iblowfish -I/usr/include -I${LOCALBASE}/include $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
||||||
# If your audio hardware is half duplex, uncomment the next line
|
|
||||||
! #DUPLEX = -DHALF_DUPLEX
|
PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfreflect sfvod
|
||||||
|
|
||||||
# If your getdomainname() does not return the DNS domainname, define:
|
@@ -150,12 +153,12 @@
|
||||||
#DOMAIN=-DMYDOMAIN=\"somedomain.net\"
|
SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o hp_audio.o
|
||||||
--- 99,108 ----
|
|
||||||
|
sfspeaker: $(SPKROBJS) adpcmlib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o
|
||||||
# Where Perl is located on your system. This is used to make
|
- $(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a des/des.o md5/md5.o idea/idea.o lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) -o sfspeaker
|
||||||
# a directly-executable version of sfvod.
|
+ $(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a des/des.o md5/md5.o idea/idea.o lpc10/liblpc10.a -lgsm lpc/lpc.o xdsub.o -ldes $(LFLAGS) -o sfspeaker
|
||||||
! PERL = /usr/bin/perl
|
|
||||||
|
MIKEOBJS = mike.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o xdsub.o hp_audio.o
|
||||||
# If your audio hardware is half duplex, uncomment the next line
|
|
||||||
! DUPLEX = -DHALF_DUPLEX
|
sfmike: $(MIKEOBJS) adpcmlib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o
|
||||||
|
- $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o md5/md5.o idea/idea.o -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike
|
||||||
# If your getdomainname() does not return the DNS domainname, define:
|
+ $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o md5/md5.o idea/idea.o -lm blowfish/libblowfish.a lpc10/liblpc10.a -lgsm lpc/lpc.o -ldes $(LFLAGS) -o sfmike
|
||||||
#DOMAIN=-DMYDOMAIN=\"somedomain.net\"
|
|
||||||
***************
|
LWLDOBJS = lwld.o html.o xdsub.o
|
||||||
*** 127,138 ****
|
|
||||||
|
@@ -191,11 +194,11 @@
|
||||||
CARGS = -DInternet_Port=$(INTERNET_PORT)
|
chmod 755 sfvod
|
||||||
|
|
||||||
! DEBUG = -g -DHEXDUMP
|
adpcmlib.o:
|
||||||
! #DEBUG = -O
|
- ( echo "Building ADPCM library."; cd adpcm ; make CC="$(CC)" )
|
||||||
|
+ ( echo "Building ADPCM library."; cd adpcm ; make CC="$(CC) $(CCFLAGS) $(DEBUG)" )
|
||||||
# Compiler flags
|
echo "ADPCM" >adpcmlib.o
|
||||||
|
|
||||||
! CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
deslib.o:
|
||||||
|
- ( echo "Building DES library."; cd des ; make CC="$(CC) $(CCFLAGS)" )
|
||||||
PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfreflect sfvod
|
+ ( echo "Building DES library."; cd des ; make CC="$(CC) $(CCFLAGS) $(DEBUG)" )
|
||||||
|
echo "DES" >deslib.o
|
||||||
--- 128,139 ----
|
|
||||||
|
libblowfish.o:
|
||||||
CARGS = -DInternet_Port=$(INTERNET_PORT)
|
@@ -203,7 +206,6 @@
|
||||||
|
echo "BLOWFISH" >libblowfish.o
|
||||||
! #DEBUG = -g -DHEXDUMP
|
|
||||||
! DEBUG = -O
|
libdes.o:
|
||||||
|
- ( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(CCFLAGS) $(DEBUG)" )
|
||||||
# Compiler flags
|
echo "LIBDES" >libdes.o
|
||||||
|
|
||||||
! CFLAGS = $(DEBUG) -I${PREFIX}/include -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
lpclib.o:
|
||||||
|
@@ -215,15 +217,14 @@
|
||||||
PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfreflect sfvod
|
echo "LPC" >lpc10lib.o
|
||||||
|
|
||||||
|
gsmlib.o:
|
||||||
|
- ( echo "Building GSM library."; cd gsm ; make CC="$(CC)" )
|
||||||
|
echo "GSM" >gsmlib.o
|
||||||
|
|
||||||
|
md5lib.o:
|
||||||
|
- ( echo "Building MD5 library."; cd md5 ; make CC="$(CC)" )
|
||||||
|
+ ( echo "Building MD5 library."; cd md5 ; make CC="$(CC) $(CCFLAGS) $(DEBUG)" )
|
||||||
|
echo "MD5" >md5lib.o
|
||||||
|
|
||||||
|
idealib.o:
|
||||||
|
- ( echo "Building IDEA library."; cd idea ; make CC="$(CC)" )
|
||||||
|
+ ( echo "Building IDEA library."; cd idea ; make CC="$(CC) $(CCFLAGS) $(DEBUG)" )
|
||||||
|
echo "IDEA" >idealib.o
|
||||||
|
|
||||||
|
codecs.o: codecs.c speakfree.h
|
||||||
|
|||||||
@ -1,15 +1,11 @@
|
|||||||
*** speakfree.h.orig Fri Jan 15 23:12:44 1999
|
--- adpcm/Makefile.orig Sat Jun 19 21:57:38 1999
|
||||||
--- speakfree.h Fri Jan 15 23:13:02 1999
|
+++ adpcm/Makefile Sat Jun 19 21:58:13 1999
|
||||||
***************
|
@@ -1,7 +1,7 @@
|
||||||
*** 14,19 ****
|
#
|
||||||
--- 14,23 ----
|
# Makefile for adpcm and test programs
|
||||||
#define BSD_like
|
# -------------------
|
||||||
#endif
|
-CFLAGS=-O -I..
|
||||||
|
+CFLAGS +=-I..
|
||||||
+ #ifdef __OpenBSD__
|
# May need this on a sun:
|
||||||
+ #define BSD_like
|
#CFLAGS=-O -I/usr/demo/SOUND
|
||||||
+ #endif
|
|
||||||
+
|
|
||||||
#ifdef __FreeBSD__
|
|
||||||
#define BSD_like
|
|
||||||
#endif
|
|
||||||
|
|||||||
@ -1,14 +1,13 @@
|
|||||||
*** mike.c.orig Fri Jan 15 23:10:04 1999
|
--- idea/Makefile.orig Sat Jun 19 21:59:52 1999
|
||||||
--- mike.c Fri Jan 15 23:11:40 1999
|
+++ idea/Makefile Sat Jun 19 22:00:06 1999
|
||||||
***************
|
@@ -6,8 +6,8 @@
|
||||||
*** 748,753 ****
|
|
||||||
--- 748,756 ----
|
# Compiler flags
|
||||||
(sb->buffer.buffer_len > 16)) {
|
|
||||||
pktlen += sizeof(sb->sendinghost);
|
-CC = cc
|
||||||
}
|
-CFLAGS = -O
|
||||||
+ /* must stay in network order for debugging output */
|
+#CC = cc
|
||||||
+ sb->compression = htonl(sb->compression);
|
+#CFLAGS = -O
|
||||||
+ sb->buffer.buffer_len = htonl(sb->buffer.buffer_len);
|
|
||||||
}
|
all: idea.o
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1,123 +1,8 @@
|
|||||||
*** soundbyte.c.orig Fri Jan 15 23:13:23 1999
|
--- md5/Makefile.orig Sat Jun 19 22:01:01 1999
|
||||||
--- soundbyte.c Fri Jan 15 23:17:36 1999
|
+++ md5/Makefile Sat Jun 19 22:01:05 1999
|
||||||
***************
|
@@ -1,4 +1,4 @@
|
||||||
*** 33,39 ****
|
-CFLAGS=-O
|
||||||
#else /* FreeBSD / Linux */
|
+#CFLAGS=-O
|
||||||
#ifdef LINUX
|
|
||||||
#include <linux/soundcard.h>
|
all: md5.o
|
||||||
! #else
|
|
||||||
#include <machine/soundcard.h>
|
|
||||||
#endif
|
|
||||||
#define AUDIO_MIN_GAIN 0
|
|
||||||
--- 33,41 ----
|
|
||||||
#else /* FreeBSD / Linux */
|
|
||||||
#ifdef LINUX
|
|
||||||
#include <linux/soundcard.h>
|
|
||||||
! #elif __OpenBSD__
|
|
||||||
! #include <soundcard.h>
|
|
||||||
! #else
|
|
||||||
#include <machine/soundcard.h>
|
|
||||||
#endif
|
|
||||||
#define AUDIO_MIN_GAIN 0
|
|
||||||
***************
|
|
||||||
*** 62,67 ****
|
|
||||||
--- 64,77 ----
|
|
||||||
|
|
||||||
#define MAX_GAIN 100
|
|
||||||
|
|
||||||
+ void soundplayvol();
|
|
||||||
+
|
|
||||||
+ #ifndef sun
|
|
||||||
+ #ifdef HALF_DUPLEX
|
|
||||||
+ static int oldvol = -1;
|
|
||||||
+ #endif
|
|
||||||
+ #endif
|
|
||||||
+
|
|
||||||
struct sound_buf {
|
|
||||||
struct sound_buf *snext; /* Next sound buffer */
|
|
||||||
int sblen; /* Length of this sound buffer */
|
|
||||||
***************
|
|
||||||
*** 157,162 ****
|
|
||||||
--- 167,187 ----
|
|
||||||
}
|
|
||||||
ioctl(Audio_fd, AUDIO_SETINFO, &Audio_info);
|
|
||||||
#endif
|
|
||||||
+ #ifndef sun
|
|
||||||
+ #ifdef HALF_DUPLEX
|
|
||||||
+ if (iomode == O_RDONLY) {
|
|
||||||
+ if (oldvol == -1)
|
|
||||||
+ oldvol = soundgetvol();
|
|
||||||
+ soundplayvol(0);
|
|
||||||
+ } else if ( iomode == O_WRONLY
|
|
||||||
+ && oldvol != -1
|
|
||||||
+ ) {
|
|
||||||
+ if (soundgetvol() == 0)
|
|
||||||
+ soundplayvol(oldvol);
|
|
||||||
+ oldvol = -1;
|
|
||||||
+ }
|
|
||||||
+ #endif
|
|
||||||
+ #endif
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
if (errno != EINTR) {
|
|
||||||
***************
|
|
||||||
*** 172,177 ****
|
|
||||||
--- 197,211 ----
|
|
||||||
void soundterm()
|
|
||||||
{
|
|
||||||
if (audiof >= 0) {
|
|
||||||
+ #ifndef sun
|
|
||||||
+ #ifdef HALF_DUPLEX
|
|
||||||
+ if (oldvol != -1) {
|
|
||||||
+ if (soundgetvol() == 0)
|
|
||||||
+ soundplayvol(oldvol);
|
|
||||||
+ oldvol = -1;
|
|
||||||
+ }
|
|
||||||
+ #endif
|
|
||||||
+ #endif
|
|
||||||
if (close(audiof) < 0) {
|
|
||||||
perror("closing audio device");
|
|
||||||
}
|
|
||||||
***************
|
|
||||||
*** 222,231 ****
|
|
||||||
|
|
||||||
arg = (value << 8) | value;
|
|
||||||
|
|
||||||
! if (ioctl(Audio_fd, MIXER_WRITE(SOUND_MIXER_PCM), &arg) < 0)
|
|
||||||
! perror("SOUND_MIXER_PCM");
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* SOUNDRECGAIN -- Set recording gain from 0 (minimum) to 100 (maximum). */
|
|
||||||
|
|
||||||
--- 256,285 ----
|
|
||||||
|
|
||||||
arg = (value << 8) | value;
|
|
||||||
|
|
||||||
! if (ioctl(Audio_fd, SOUND_MIXER_WRITE_PCM, &arg) < 0)
|
|
||||||
! perror("SOUND_MIXER_WRITE_PCM");
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ #ifndef sun
|
|
||||||
+ #ifdef HALF_DUPLEX
|
|
||||||
+
|
|
||||||
+ /* SOUNDGETVOL -- Get current playback volume. */
|
|
||||||
+
|
|
||||||
+ int soundgetvol()
|
|
||||||
+ {
|
|
||||||
+ int arg, v1, v2;
|
|
||||||
+
|
|
||||||
+ if (ioctl(Audio_fd, SOUND_MIXER_READ_PCM, &arg) < 0) {
|
|
||||||
+ perror("SOUND_MIXER_READ_PCM");
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
+ v1 = arg & 0xFF;
|
|
||||||
+ v2 = (arg >> 8) & 0xFF;
|
|
||||||
+ return (v1 > v2) ? v1 : v2;
|
|
||||||
+ }
|
|
||||||
+ #endif
|
|
||||||
+ #endif
|
|
||||||
|
|
||||||
/* SOUNDRECGAIN -- Set recording gain from 0 (minimum) to 100 (maximum). */
|
|
||||||
|
|
||||||
|
|||||||
19
mbone/speak_freely/patches/patch-ae
Normal file
19
mbone/speak_freely/patches/patch-ae
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--- blowfish/Makefile.orig Sat Jun 19 22:02:15 1999
|
||||||
|
+++ blowfish/Makefile Sat Jun 19 22:04:25 1999
|
||||||
|
@@ -17,14 +17,14 @@
|
||||||
|
#OPTS= # use for pentium pro, Alpha and HP
|
||||||
|
|
||||||
|
MAKE=make -f Makefile
|
||||||
|
-CC=cc
|
||||||
|
+#CC=cc
|
||||||
|
CFLAG= -O
|
||||||
|
|
||||||
|
#CC=gcc
|
||||||
|
#CFLAG= -O4 -funroll-loops -fomit-frame-pointer
|
||||||
|
#CFLAG= -O3 -fomit-frame-pointer
|
||||||
|
|
||||||
|
-CFLAGS=$(OPTS) $(CFLAG)
|
||||||
|
+#CFLAGS=$(OPTS) $(CFLAG)
|
||||||
|
CPP=$(CC) -E
|
||||||
|
AS=as
|
||||||
|
|
||||||
14
mbone/speak_freely/patches/patch-af
Normal file
14
mbone/speak_freely/patches/patch-af
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
--- lpc/Makefile.orig Sat Jun 19 22:10:11 1999
|
||||||
|
+++ lpc/Makefile Sat Jun 19 22:10:36 1999
|
||||||
|
@@ -1,9 +1,8 @@
|
||||||
|
-
|
||||||
|
lpc.o: lpc.c lpc.h
|
||||||
|
- $(CC) -c lpc.c
|
||||||
|
+ $(CC) $(CFLAGS) -c lpc.c
|
||||||
|
|
||||||
|
lpctest: lpctest.c lpc.o
|
||||||
|
- $(CC) lpctest.c lpc.o ../ulaw.o -o lpctest -lm
|
||||||
|
+ $(CC) $(CFLAGS) lpctest.c lpc.o ../ulaw.o -o lpctest -lm
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *.bak *.o lpctest core
|
||||||
8
mbone/speak_freely/patches/patch-ag
Normal file
8
mbone/speak_freely/patches/patch-ag
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
--- des/Makefile.orig Sat Jun 19 23:07:21 1999
|
||||||
|
+++ des/Makefile Sat Jun 19 23:07:28 1999
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-CFLAGS=-O
|
||||||
|
+#CFLAGS=-O
|
||||||
|
|
||||||
|
all: des.o
|
||||||
|
|
||||||
11
mbone/speak_freely/patches/patch-ah
Normal file
11
mbone/speak_freely/patches/patch-ah
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- speakfree.h.orig Sat Jun 19 22:24:36 1999
|
||||||
|
+++ speakfree.h Sat Jun 19 22:25:13 1999
|
||||||
|
@@ -12,7 +12,7 @@
|
||||||
|
#define BSD_like
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#ifdef __FreeBSD__
|
||||||
|
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||||
|
#define BSD_like
|
||||||
|
#endif
|
||||||
|
|
||||||
18
mbone/speak_freely/patches/patch-ai
Normal file
18
mbone/speak_freely/patches/patch-ai
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
--- mike.c.orig Tue Apr 6 10:50:42 1999
|
||||||
|
+++ mike.c Sat Jun 19 22:50:40 1999
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-/*#define USE_CURSES*/
|
||||||
|
+#define USE_CURSES
|
||||||
|
#define BYTE_SWAP_DEBUG
|
||||||
|
/*
|
||||||
|
|
||||||
|
@@ -845,6 +845,9 @@
|
||||||
|
(sb->buffer.buffer_len > 16)) {
|
||||||
|
pktlen += sizeof(sb->sendinghost);
|
||||||
|
}
|
||||||
|
+ /* must stay in network order for debugging output */
|
||||||
|
+ sb->compression = htonl(sb->compression);
|
||||||
|
+ sb->buffer.buffer_len = htonl(sb->buffer.buffer_len);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
97
mbone/speak_freely/patches/patch-aj
Normal file
97
mbone/speak_freely/patches/patch-aj
Normal file
@ -0,0 +1,97 @@
|
|||||||
|
--- soundbyte.c.orig Sat Jun 19 22:28:53 1999
|
||||||
|
+++ soundbyte.c Sat Jun 19 22:37:22 1999
|
||||||
|
@@ -33,6 +33,8 @@
|
||||||
|
#else /* FreeBSD / Linux */
|
||||||
|
#ifdef LINUX
|
||||||
|
#include <linux/soundcard.h>
|
||||||
|
+#elif __OpenBSD__
|
||||||
|
+#include <soundcard.h>
|
||||||
|
#else
|
||||||
|
#include <machine/soundcard.h>
|
||||||
|
#endif
|
||||||
|
@@ -62,6 +64,14 @@
|
||||||
|
|
||||||
|
#define MAX_GAIN 100
|
||||||
|
|
||||||
|
+void soundplayvol();
|
||||||
|
+
|
||||||
|
+#ifndef sun
|
||||||
|
+#ifdef HALF_DUPLEX
|
||||||
|
+static int oldvol = -1;
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
struct sound_buf {
|
||||||
|
struct sound_buf *snext; /* Next sound buffer */
|
||||||
|
int sblen; /* Length of this sound buffer */
|
||||||
|
@@ -178,6 +188,21 @@
|
||||||
|
}
|
||||||
|
ioctl(Audio_fd, AUDIO_SETINFO, &Audio_info);
|
||||||
|
#endif
|
||||||
|
+#ifndef sun
|
||||||
|
+#ifdef HALF_DUPLEX
|
||||||
|
+ if (iomode == O_RDONLY) {
|
||||||
|
+ if (oldvol == -1)
|
||||||
|
+ oldvol = soundgetvol();
|
||||||
|
+ soundplayvol(0);
|
||||||
|
+ } else if ( iomode == O_WRONLY
|
||||||
|
+ && oldvol != -1
|
||||||
|
+ ) {
|
||||||
|
+ if (soundgetvol() == 0)
|
||||||
|
+ soundplayvol(oldvol);
|
||||||
|
+ oldvol = -1;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
if (errno != EINTR) {
|
||||||
|
@@ -193,6 +218,15 @@
|
||||||
|
void soundterm()
|
||||||
|
{
|
||||||
|
if (audiof >= 0) {
|
||||||
|
+#ifndef sun
|
||||||
|
+#ifdef HALF_DUPLEX
|
||||||
|
+ if (oldvol != -1) {
|
||||||
|
+ if (soundgetvol() == 0)
|
||||||
|
+ soundplayvol(oldvol);
|
||||||
|
+ oldvol = -1;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
if (close(audiof) < 0) {
|
||||||
|
perror("closing audio device");
|
||||||
|
}
|
||||||
|
@@ -243,10 +277,30 @@
|
||||||
|
|
||||||
|
arg = (value << 8) | value;
|
||||||
|
|
||||||
|
- if (ioctl(Audio_fd, MIXER_WRITE(SOUND_MIXER_PCM), &arg) < 0)
|
||||||
|
- perror("SOUND_MIXER_PCM");
|
||||||
|
+ if (ioctl(Audio_fd, SOUND_MIXER_WRITE_PCM, &arg) < 0)
|
||||||
|
+ perror("SOUND_MIXER_WRITE_PCM");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+#ifndef sun
|
||||||
|
+#ifdef HALF_DUPLEX
|
||||||
|
+
|
||||||
|
+/* SOUNDGETVOL -- Get current playback volume. */
|
||||||
|
+
|
||||||
|
+int soundgetvol()
|
||||||
|
+{
|
||||||
|
+ int arg, v1, v2;
|
||||||
|
+
|
||||||
|
+ if (ioctl(Audio_fd, SOUND_MIXER_READ_PCM, &arg) < 0) {
|
||||||
|
+ perror("SOUND_MIXER_READ_PCM");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+ v1 = arg & 0xFF;
|
||||||
|
+ v2 = (arg >> 8) & 0xFF;
|
||||||
|
+ return (v1 > v2) ? v1 : v2;
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* SOUNDRECGAIN -- Set recording gain from 0 (minimum) to 100 (maximum). */
|
||||||
|
|
||||||
@ -14,3 +14,4 @@ man/man1/sfmike.1
|
|||||||
man/man1/sfspeaker.1
|
man/man1/sfspeaker.1
|
||||||
man/man1/sfvod.1
|
man/man1/sfvod.1
|
||||||
man/man1/sfreflect.1
|
man/man1/sfreflect.1
|
||||||
|
@dirrm lib/speak_freely
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user