diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1997-09-23 23:30:44 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1997-09-23 23:30:44 +0000 |
commit | 3f77b93c9eb3c40d6b122c8544625319eb5297d3 (patch) | |
tree | 43d0abcd062205dd29ccb771f51afda203798fbe /audio/speak_freely/files | |
parent | Upgrade to 3.03 (diff) |
Upgrade to 6.1c
Notes
Notes:
svn path=/head/; revision=8008
Diffstat (limited to 'audio/speak_freely/files')
-rw-r--r-- | audio/speak_freely/files/patch-aa | 110 | ||||
-rw-r--r-- | audio/speak_freely/files/patch-ae | 21 |
2 files changed, 57 insertions, 74 deletions
diff --git a/audio/speak_freely/files/patch-aa b/audio/speak_freely/files/patch-aa index d143679815fe..0e10b0d18e94 100644 --- a/audio/speak_freely/files/patch-aa +++ b/audio/speak_freely/files/patch-aa @@ -1,24 +1,26 @@ -*** Makefile.bak Thu May 22 15:10:44 1997 ---- Makefile Wed Jun 11 22:36:10 1997 +*** Makefile.orig Mon Jul 21 17:06:21 1997 +--- Makefile Wed Sep 24 02:36:37 1997 *************** -*** 15,22 **** - # will tell you whether these components are present on your system. - # If they aren't, you need to install them before building Speak - # Freely. -! CC = cc -float -signed -! LFLAGS = -laudio -lcurses -lm - - # SunOS 4.1.x - #CC = cc -fsingle -DOLDCC ---- 15,22 ---- - # will tell you whether these components are present on your system. - # If they aren't, you need to install them before building Speak - # Freely. -! #CC = cc -float -signed -! #LFLAGS = -laudio -lcurses -lm - - # SunOS 4.1.x - #CC = cc -fsingle -DOLDCC +*** 32,40 **** + # THREADS, you can also remove the "-lpthread" library specification + # from the LFLAGS line, which may cause an error if the system does + # not include the POSIX threads library. +! CC = cc -fsingle # for Sun Compiler +! CCFLAGS = -DSolaris -DTHREADS +! LFLAGS = -lcurses -lsocket -lnsl -lm -lpthread + + # FreeBSD 2.2 courtesy of Andrey A. Chernov + # +--- 32,40 ---- + # THREADS, you can also remove the "-lpthread" library specification + # from the LFLAGS line, which may cause an error if the system does + # not include the POSIX threads library. +! #CC = cc -fsingle # for Sun Compiler +! #CCFLAGS = -DSolaris -DTHREADS +! #LFLAGS = -lcurses -lsocket -lnsl -lm -lpthread + + # FreeBSD 2.2 courtesy of Andrey A. Chernov + # *************** *** 46,53 **** # Depending on how your driver handles non-blocking I/O, @@ -29,19 +31,18 @@ # ** Linux users please note: many Linux audio drivers are # half-duplex, even through your sound card may actually ---- 46,53 ---- +--- 46,54 ---- # Depending on how your driver handles non-blocking I/O, # you may also have to add -DAUDIO_BLOCKING to the # CCFLAGS line. +! PREFIX=/usr/local ! CCFLAGS = -DM_LITTLE_ENDIAN -! LFLAGS = -lcurses -ltermcap -lcompat -lm +! LFLAGS = -L${PREFIX}/lib -lcurses -ltermcap -lcompat -lm # ** Linux users please note: many Linux audio drivers are # half-duplex, even through your sound card may actually *************** -*** 76,87 **** - #CCFLAGS = -DHEWLETT_PACKARD -DOLDCC - #LFLAGS = -lAlib -lcurses -ltermcap -lm +*** 78,87 **** # Where Perl is located on your system. This is used to make # a directly-executable version of sfvod. @@ -52,12 +53,8 @@ # If your getdomainname() does not return the DNS domainname, define: #DOMAIN=-DMYDOMAIN=\"somedomain.net\" ---- 76,89 ---- - #CCFLAGS = -DHEWLETT_PACKARD -DOLDCC - #LFLAGS = -lAlib -lcurses -ltermcap -lm +--- 79,88 ---- -+ PREFIX=/usr/local -+ # Where Perl is located on your system. This is used to make # a directly-executable version of sfvod. ! PERL = /usr/bin/perl @@ -68,7 +65,7 @@ # If your getdomainname() does not return the DNS domainname, define: #DOMAIN=-DMYDOMAIN=\"somedomain.net\" *************** -*** 110,120 **** +*** 108,118 **** CARGS = -DInternet_Port=$(INTERNET_PORT) #DEBUG = -g -DHEXDUMP @@ -76,11 +73,11 @@ # Compiler flags -! CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes $(CARGS) -DRelno=$(REL) $(DUPLEX) $(CCFLAGS) $(DOMAIN) +! CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN) PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfvod ---- 112,130 ---- +--- 109,127 ---- CARGS = -DInternet_Port=$(INTERNET_PORT) #DEBUG = -g -DHEXDUMP @@ -96,12 +93,12 @@ # Compiler flags -! CFLAGS += $(DEBUG) -Iadpcm -Ilpc -Iidea $(IDES) -I/usr/include -I${PREFIX}/include $(CARGS) -DRelno=$(REL) $(DUPLEX) $(CCFLAGS) $(DOMAIN) +! CFLAGS += $(DEBUG) -Iadpcm -Ilpc -Iidea $(IDES) -I/usr/include -I${PREFIX}/include $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN) PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfvod *************** -*** 122,134 **** +*** 120,132 **** 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 @@ -115,22 +112,22 @@ LWLDOBJS = lwld.o xdsub.o ---- 132,144 ---- +--- 129,141 ---- 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 ! sfspeaker: $(SPKROBJS) adpcmlib.o lpclib.o lpc10lib.o deslib.o idealib.o libdes.o xdsub.o -! $(CC) $(SPKROBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -L${PREFIX}/lib -lgsm lpc/lpc.o xdsub.o -lmd $(LDES) $(LFLAGS) -o sfspeaker +! $(CC) $(SPKROBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -lgsm lpc/lpc.o xdsub.o -lmd $(LDES) $(LFLAGS) -o sfspeaker 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 ! sfmike: $(MIKEOBJS) adpcmlib.o lpclib.o lpc10lib.o deslib.o idealib.o libdes.o -! $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -lm -L${PREFIX}/lib -lgsm lpc/lpc.o -lmd $(LDES) $(LFLAGS) -o sfmike +! $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o idea/idea.o -lm lpc10/liblpc10.a -lgsm lpc/lpc.o -lmd $(LDES) $(LFLAGS) -o sfmike LWLDOBJS = lwld.o xdsub.o *************** -*** 142,149 **** +*** 140,147 **** ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o @@ -139,7 +136,7 @@ sfvod: sfvod.pl echo \#\! $(PERL) >sfvod ---- 152,159 ---- +--- 149,156 ---- ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o @@ -149,7 +146,7 @@ sfvod: sfvod.pl echo \#\! $(PERL) >sfvod *************** -*** 159,169 **** +*** 157,167 **** chmod 755 sfvod adpcmlib.o: @@ -161,7 +158,7 @@ echo "LIBDES" >libdes.o lpclib.o: ---- 169,181 ---- +--- 166,178 ---- chmod 755 sfvod adpcmlib.o: @@ -176,28 +173,7 @@ lpclib.o: *************** -*** 175,181 **** - echo "LPC" >lpc10lib.o - - gsmlib.o: -! ( echo "Building GSM library."; cd gsm ; make CC="$(CC)" ) - echo "GSM" >gsmlib.o - - deslib.o: ---- 187,193 ---- - echo "LPC" >lpc10lib.o - - gsmlib.o: -! ( echo "Building GSM library."; cd gsm ; make CC="$(CC) $(CCFLAGS)" ) - echo "GSM" >gsmlib.o - - deslib.o: -*************** -*** 183,193 **** - echo "DES" >deslib.o - - md5lib.o: -! ( echo "Building MD5 library."; cd md5 ; make CC="$(CC)" ) +*** 185,191 **** echo "MD5" >md5lib.o idealib.o: @@ -205,11 +181,7 @@ echo "IDEA" >idealib.o codecs.o: codecs.c speakfree.h ---- 195,205 ---- - echo "DES" >deslib.o - - md5lib.o: -! ( echo "Building MD5 library."; cd md5 ; make CC="$(CC) $(CCFLAGS)" ) +--- 196,202 ---- echo "MD5" >md5lib.o idealib.o: diff --git a/audio/speak_freely/files/patch-ae b/audio/speak_freely/files/patch-ae index f1bc0cd6259f..eb58a7f980de 100644 --- a/audio/speak_freely/files/patch-ae +++ b/audio/speak_freely/files/patch-ae @@ -1,5 +1,5 @@ *** soundbyte.c.orig Wed Mar 5 23:04:49 1997 ---- soundbyte.c Wed Jun 11 22:50:54 1997 +--- soundbyte.c Wed Sep 24 02:39:23 1997 *************** *** 15,21 **** --- 15,23 ---- @@ -13,8 +13,19 @@ #endif *************** +*** 72,77 **** +--- 74,81 ---- + static unsigned char *playbuf= NULL; /* Current play pointer */ + static int squelch = 0; /* Squelch value */ + ++ void soundplayvol(); ++ + /* Convert local gain into device parameters */ + + static unsigned scale_gain(g) +*************** *** 96,101 **** ---- 98,108 ---- +--- 100,110 ---- } #endif @@ -28,7 +39,7 @@ access. Return TRUE if successful, FALSE *************** *** 145,150 **** ---- 152,172 ---- +--- 154,174 ---- } ioctl(Audio_fd, AUDIO_SETINFO, &Audio_info); #endif @@ -52,7 +63,7 @@ if (errno != EINTR) { *************** *** 160,165 **** ---- 182,196 ---- +--- 184,198 ---- void soundterm() { if (audiof >= 0) { @@ -80,7 +91,7 @@ /* SOUNDRECGAIN -- Set recording gain from 0 (minimum) to 100 (maximum). */ ---- 241,270 ---- +--- 243,272 ---- arg = (value << 8) | value; |