mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Update to 7.6a.
PR: 53302 Submitted by: Michael A. Dickerson <mikey@singingtree.com>
This commit is contained in:
parent
9b4147b882
commit
0133c0ed4f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=83603
8 changed files with 86 additions and 72 deletions
|
@ -6,12 +6,12 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= speak_freely
|
PORTNAME= speak_freely
|
||||||
PORTVERSION= 7.5
|
PORTVERSION= 7.6a
|
||||||
CATEGORIES= mbone audio security
|
CATEGORIES= mbone audio security
|
||||||
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/download/${PORTVERSION}/
|
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/download/7.6/
|
||||||
|
|
||||||
MAINTAINER= ports@FreeBSD.org
|
MAINTAINER= ports@FreeBSD.org
|
||||||
COMMENT= Voice Communication Over Data Networks
|
COMMENT= Voice communication over data networks
|
||||||
|
|
||||||
LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
|
LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
|
||||||
|
|
||||||
|
@ -23,11 +23,6 @@ MAN1= ${UTILS:S/$/.1/} ${DEMNS:S/$/.1/} ${DDEMNS:S/$/.1/}
|
||||||
|
|
||||||
MAKE_ENV= "OPTFLAGS=${CFLAGS}"
|
MAKE_ENV= "OPTFLAGS=${CFLAGS}"
|
||||||
|
|
||||||
post-patch:
|
|
||||||
@${SED} -e 's,machine/soundcard.h,sys/soundcard.h,' < \
|
|
||||||
${WRKSRC}/soundbyte.c > ${WRKSRC}/soundbyte.c.new
|
|
||||||
@${MV} ${WRKSRC}/soundbyte.c.new ${WRKSRC}/soundbyte.c
|
|
||||||
|
|
||||||
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}; \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
MD5 (speak_freely-7.5.tar.gz) = fd315f8fd9996b7f34e83d8249ecd89f
|
MD5 (speak_freely-7.6a.tar.gz) = 0c35c891d24f8df7f2bdedc3b91ab161
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- Makefile.orig Fri Oct 19 07:01:35 2001
|
--- Makefile.orig Sun Jun 8 22:21:55 2003
|
||||||
+++ Makefile Thu Dec 12 02:44:56 2002
|
+++ Makefile Sun Jun 8 22:33:37 2003
|
||||||
@@ -6,7 +6,7 @@
|
@@ -6,7 +6,7 @@
|
||||||
#DEBUG = -O
|
#DEBUG = -O
|
||||||
#DEBUG = -g -DHEXDUMP
|
#DEBUG = -g -DHEXDUMP
|
||||||
|
@ -9,60 +9,60 @@
|
||||||
|
|
||||||
# Installation
|
# Installation
|
||||||
|
|
||||||
@@ -43,13 +43,13 @@
|
@@ -50,13 +50,13 @@
|
||||||
# of the available flags which follows these declarations.
|
# of the available flags which follows these declarations.
|
||||||
#
|
#
|
||||||
#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN
|
#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN
|
||||||
-CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER
|
-CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER -DHAVE_DEV_RANDOM
|
||||||
-CC = gcc -Wall # for GNU's gcc compiler
|
-CC = gcc -Wall # for GNU's gcc compiler
|
||||||
+#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER
|
+#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER -DHAVE_DEV_RANDOM
|
||||||
+#CC = gcc -Wall # for GNU's gcc compiler
|
+#CC = gcc -Wall # for GNU's gcc compiler
|
||||||
# CELPFLAGS below are tweaked for GCC 2.96 on Intel Pentium
|
# CELPFLAGS below are tweaked for GCC 2.96 on Intel Pentium.
|
||||||
# Comment out if you are using a compiler which doesn't
|
# Comment out if you are using a compiler which doesn't
|
||||||
# understand these options.
|
# understand these options.
|
||||||
-CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
|
-CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
|
||||||
-LFLAGS = -lncurses -lm
|
-LFLAGS = -lncurses -lm
|
||||||
+#CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
|
+#CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
|
||||||
+#LFLAGS = -lncurses -lm
|
+#LFLAGS = -lncurses -lm
|
||||||
#
|
|
||||||
# If the above LFLAGS doesn't work, try the one below.
|
|
||||||
#LFLAGS = -lcurses -lm
|
# If you want to use ALSA instead of OSS, uncomment the following
|
||||||
@@ -237,8 +237,8 @@
|
@@ -269,8 +269,8 @@
|
||||||
# Depending on how your driver handles non-blocking I/O,
|
# Depending on how your driver handles non-blocking I/O,
|
||||||
# you may also have to add -DAUDIO_BLOCKING to the
|
# you may also have to add -DAUDIO_BLOCKING to the
|
||||||
# CCFLAGS line.
|
# CCFLAGS line.
|
||||||
-#CCFLAGS = -DM_LITTLE_ENDIAN
|
-#CCFLAGS = -DM_LITTLE_ENDIAN
|
||||||
-#LFLAGS = -lcurses -ltermcap -lcompat -lm
|
-#LFLAGS = -lcurses -ltermcap -lcompat -lm
|
||||||
+CCFLAGS = -DM_LITTLE_ENDIAN -DHALF_DUPLEX -DAUDIO_BLOCKING -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER
|
+CCFLAGS = -DM_LITTLE_ENDIAN -DAUDIO_BLOCKING -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER
|
||||||
+LFLAGS = -lcurses -ltermcap -lcompat -lm
|
+LFLAGS = -lcurses -ltermcap -lcompat -lm
|
||||||
|
|
||||||
# Hewlett-Packard
|
# Hewlett-Packard
|
||||||
# (courtesy of Marc Kilian)
|
# (courtesy of Marc Kilian)
|
||||||
@@ -286,7 +286,7 @@
|
@@ -318,7 +318,7 @@
|
||||||
|
|
||||||
# Compiler flags
|
# Compiler flags
|
||||||
|
|
||||||
-CFLAGS = $(DEBUG) -Iadpcm -Icelp -Ilpc -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
-CFLAGS = $(DEBUG) $(PKOPTS) -Iadpcm -Iaes -Icelp -Ilpc -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
||||||
+CFLAGS = $(OPTFLAGS) $(DEBUG) -Iadpcm -Icelp -Ilpc -I$(LOCALBASE)/include -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
+CFLAGS = $(OPTFLAGS) $(DEBUG) $(PKOPTS) -Iadpcm -Iaes -Icelp -Ilpc -I$(LOCALBASE)/include -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
||||||
|
|
||||||
BINARIES = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect
|
BINARIES = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect
|
||||||
|
|
||||||
@@ -301,12 +301,12 @@
|
@@ -333,12 +333,12 @@
|
||||||
SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o audio_hp.o audio_sgi.o common.o
|
SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o tempfile.o ulaw.o usleep.o vatpkt.o vox.o audio_hp.o audio_sgi.o audio_alsa.o common.o
|
||||||
|
|
||||||
sfspeaker: $(SPKROBJS) adpcmlib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o
|
sfspeaker: $(SPKROBJS) adpcmlib.o aeslib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o
|
||||||
- $(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a celp/celp.o des/des.a md5/md5.o idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) -o sfspeaker
|
- $(CC) $(SPKROBJS) adpcm/adpcm-u.o aes/aes.a blowfish/libblowfish.a celp/celp.o des/des.a md5/md5.o idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfspeaker
|
||||||
+ $(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a celp/celp.o des/des.a -lmd idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) -o sfspeaker
|
+ $(CC) $(SPKROBJS) adpcm/adpcm-u.o aes/aes.a blowfish/libblowfish.a celp/celp.o des/des.a -lmd idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -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 audio_hp.o audio_sgi.o
|
MIKEOBJS = mike.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o tempfile.o ulaw.o usleep.o vatpkt.o xdsub.o audio_hp.o audio_sgi.o audio_alsa.o
|
||||||
|
|
||||||
sfmike: $(MIKEOBJS) adpcmlib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o
|
sfmike: $(MIKEOBJS) adpcmlib.o aeslib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o
|
||||||
- $(CC) $(MIKEOBJS) adpcm/adpcm-u.o celp/celp.o des/des.a md5/md5.o idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike
|
- $(CC) $(MIKEOBJS) adpcm/adpcm-u.o aes/aes.a celp/celp.o des/des.a md5/md5.o idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfmike
|
||||||
+ $(CC) $(MIKEOBJS) adpcm/adpcm-u.o celp/celp.o des/des.a -lmd idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike
|
+ $(CC) $(MIKEOBJS) adpcm/adpcm-u.o aes/aes.a celp/celp.o des/des.a -lmd idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfmike
|
||||||
|
|
||||||
LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o
|
LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o
|
||||||
|
|
||||||
@@ -326,12 +326,12 @@
|
@@ -358,12 +358,12 @@
|
||||||
ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
|
ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
|
||||||
|
|
||||||
sfecho: $(ECHOOBJS) md5lib.o
|
sfecho: $(ECHOOBJS) md5lib.o
|
||||||
|
@ -77,7 +77,7 @@
|
||||||
|
|
||||||
# Configure the voice on demand server for the platform's
|
# Configure the voice on demand server for the platform's
|
||||||
# location of Perl and network constant definitions.
|
# location of Perl and network constant definitions.
|
||||||
@@ -376,11 +376,11 @@
|
@@ -412,11 +412,11 @@
|
||||||
echo "BLOWFISH" >libblowfish.o
|
echo "BLOWFISH" >libblowfish.o
|
||||||
|
|
||||||
libdes.o:
|
libdes.o:
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
--- soundbyte.c.orig Fri Dec 31 15:36:07 1999
|
|
||||||
+++ soundbyte.c Fri Dec 31 15:38:58 1999
|
$FreeBSD$
|
||||||
|
|
||||||
|
--- soundbyte.c.orig Fri Feb 28 23:18:38 2003
|
||||||
|
+++ soundbyte.c Wed Jun 25 19:42:45 2003
|
||||||
@@ -13,7 +13,9 @@
|
@@ -13,7 +13,9 @@
|
||||||
#ifdef Solaris
|
#ifdef Solaris
|
||||||
#include <sys/filio.h>
|
#include <sys/filio.h>
|
||||||
|
@ -10,3 +13,12 @@
|
||||||
#include <sys/file.h>
|
#include <sys/file.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -32,7 +34,7 @@
|
||||||
|
#ifdef LINUX
|
||||||
|
#include <linux/soundcard.h>
|
||||||
|
#else /*!LINUX */
|
||||||
|
-#include <machine/soundcard.h>
|
||||||
|
+#include <sys/soundcard.h>
|
||||||
|
#endif /* LINUX */
|
||||||
|
#endif /* sun */
|
||||||
|
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= speak_freely
|
PORTNAME= speak_freely
|
||||||
PORTVERSION= 7.5
|
PORTVERSION= 7.6a
|
||||||
CATEGORIES= mbone audio security
|
CATEGORIES= mbone audio security
|
||||||
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/download/${PORTVERSION}/
|
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/download/7.6/
|
||||||
|
|
||||||
MAINTAINER= ports@FreeBSD.org
|
MAINTAINER= ports@FreeBSD.org
|
||||||
COMMENT= Voice Communication Over Data Networks
|
COMMENT= Voice communication over data networks
|
||||||
|
|
||||||
LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
|
LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
|
||||||
|
|
||||||
|
@ -23,11 +23,6 @@ MAN1= ${UTILS:S/$/.1/} ${DEMNS:S/$/.1/} ${DDEMNS:S/$/.1/}
|
||||||
|
|
||||||
MAKE_ENV= "OPTFLAGS=${CFLAGS}"
|
MAKE_ENV= "OPTFLAGS=${CFLAGS}"
|
||||||
|
|
||||||
post-patch:
|
|
||||||
@${SED} -e 's,machine/soundcard.h,sys/soundcard.h,' < \
|
|
||||||
${WRKSRC}/soundbyte.c > ${WRKSRC}/soundbyte.c.new
|
|
||||||
@${MV} ${WRKSRC}/soundbyte.c.new ${WRKSRC}/soundbyte.c
|
|
||||||
|
|
||||||
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}; \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
MD5 (speak_freely-7.5.tar.gz) = fd315f8fd9996b7f34e83d8249ecd89f
|
MD5 (speak_freely-7.6a.tar.gz) = 0c35c891d24f8df7f2bdedc3b91ab161
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- Makefile.orig Fri Oct 19 07:01:35 2001
|
--- Makefile.orig Sun Jun 8 22:21:55 2003
|
||||||
+++ Makefile Thu Dec 12 02:44:56 2002
|
+++ Makefile Sun Jun 8 22:33:37 2003
|
||||||
@@ -6,7 +6,7 @@
|
@@ -6,7 +6,7 @@
|
||||||
#DEBUG = -O
|
#DEBUG = -O
|
||||||
#DEBUG = -g -DHEXDUMP
|
#DEBUG = -g -DHEXDUMP
|
||||||
|
@ -9,60 +9,60 @@
|
||||||
|
|
||||||
# Installation
|
# Installation
|
||||||
|
|
||||||
@@ -43,13 +43,13 @@
|
@@ -50,13 +50,13 @@
|
||||||
# of the available flags which follows these declarations.
|
# of the available flags which follows these declarations.
|
||||||
#
|
#
|
||||||
#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN
|
#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN
|
||||||
-CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER
|
-CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER -DHAVE_DEV_RANDOM
|
||||||
-CC = gcc -Wall # for GNU's gcc compiler
|
-CC = gcc -Wall # for GNU's gcc compiler
|
||||||
+#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER
|
+#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER -DHAVE_DEV_RANDOM
|
||||||
+#CC = gcc -Wall # for GNU's gcc compiler
|
+#CC = gcc -Wall # for GNU's gcc compiler
|
||||||
# CELPFLAGS below are tweaked for GCC 2.96 on Intel Pentium
|
# CELPFLAGS below are tweaked for GCC 2.96 on Intel Pentium.
|
||||||
# Comment out if you are using a compiler which doesn't
|
# Comment out if you are using a compiler which doesn't
|
||||||
# understand these options.
|
# understand these options.
|
||||||
-CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
|
-CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
|
||||||
-LFLAGS = -lncurses -lm
|
-LFLAGS = -lncurses -lm
|
||||||
+#CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
|
+#CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
|
||||||
+#LFLAGS = -lncurses -lm
|
+#LFLAGS = -lncurses -lm
|
||||||
#
|
|
||||||
# If the above LFLAGS doesn't work, try the one below.
|
|
||||||
#LFLAGS = -lcurses -lm
|
# If you want to use ALSA instead of OSS, uncomment the following
|
||||||
@@ -237,8 +237,8 @@
|
@@ -269,8 +269,8 @@
|
||||||
# Depending on how your driver handles non-blocking I/O,
|
# Depending on how your driver handles non-blocking I/O,
|
||||||
# you may also have to add -DAUDIO_BLOCKING to the
|
# you may also have to add -DAUDIO_BLOCKING to the
|
||||||
# CCFLAGS line.
|
# CCFLAGS line.
|
||||||
-#CCFLAGS = -DM_LITTLE_ENDIAN
|
-#CCFLAGS = -DM_LITTLE_ENDIAN
|
||||||
-#LFLAGS = -lcurses -ltermcap -lcompat -lm
|
-#LFLAGS = -lcurses -ltermcap -lcompat -lm
|
||||||
+CCFLAGS = -DM_LITTLE_ENDIAN -DHALF_DUPLEX -DAUDIO_BLOCKING -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER
|
+CCFLAGS = -DM_LITTLE_ENDIAN -DAUDIO_BLOCKING -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER
|
||||||
+LFLAGS = -lcurses -ltermcap -lcompat -lm
|
+LFLAGS = -lcurses -ltermcap -lcompat -lm
|
||||||
|
|
||||||
# Hewlett-Packard
|
# Hewlett-Packard
|
||||||
# (courtesy of Marc Kilian)
|
# (courtesy of Marc Kilian)
|
||||||
@@ -286,7 +286,7 @@
|
@@ -318,7 +318,7 @@
|
||||||
|
|
||||||
# Compiler flags
|
# Compiler flags
|
||||||
|
|
||||||
-CFLAGS = $(DEBUG) -Iadpcm -Icelp -Ilpc -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
-CFLAGS = $(DEBUG) $(PKOPTS) -Iadpcm -Iaes -Icelp -Ilpc -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
||||||
+CFLAGS = $(OPTFLAGS) $(DEBUG) -Iadpcm -Icelp -Ilpc -I$(LOCALBASE)/include -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
+CFLAGS = $(OPTFLAGS) $(DEBUG) $(PKOPTS) -Iadpcm -Iaes -Icelp -Ilpc -I$(LOCALBASE)/include -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
|
||||||
|
|
||||||
BINARIES = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect
|
BINARIES = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect
|
||||||
|
|
||||||
@@ -301,12 +301,12 @@
|
@@ -333,12 +333,12 @@
|
||||||
SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o audio_hp.o audio_sgi.o common.o
|
SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o tempfile.o ulaw.o usleep.o vatpkt.o vox.o audio_hp.o audio_sgi.o audio_alsa.o common.o
|
||||||
|
|
||||||
sfspeaker: $(SPKROBJS) adpcmlib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o
|
sfspeaker: $(SPKROBJS) adpcmlib.o aeslib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o
|
||||||
- $(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a celp/celp.o des/des.a md5/md5.o idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) -o sfspeaker
|
- $(CC) $(SPKROBJS) adpcm/adpcm-u.o aes/aes.a blowfish/libblowfish.a celp/celp.o des/des.a md5/md5.o idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfspeaker
|
||||||
+ $(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a celp/celp.o des/des.a -lmd idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) -o sfspeaker
|
+ $(CC) $(SPKROBJS) adpcm/adpcm-u.o aes/aes.a blowfish/libblowfish.a celp/celp.o des/des.a -lmd idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -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 audio_hp.o audio_sgi.o
|
MIKEOBJS = mike.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o tempfile.o ulaw.o usleep.o vatpkt.o xdsub.o audio_hp.o audio_sgi.o audio_alsa.o
|
||||||
|
|
||||||
sfmike: $(MIKEOBJS) adpcmlib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o
|
sfmike: $(MIKEOBJS) adpcmlib.o aeslib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o
|
||||||
- $(CC) $(MIKEOBJS) adpcm/adpcm-u.o celp/celp.o des/des.a md5/md5.o idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike
|
- $(CC) $(MIKEOBJS) adpcm/adpcm-u.o aes/aes.a celp/celp.o des/des.a md5/md5.o idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfmike
|
||||||
+ $(CC) $(MIKEOBJS) adpcm/adpcm-u.o celp/celp.o des/des.a -lmd idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike
|
+ $(CC) $(MIKEOBJS) adpcm/adpcm-u.o aes/aes.a celp/celp.o des/des.a -lmd idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfmike
|
||||||
|
|
||||||
LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o
|
LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o
|
||||||
|
|
||||||
@@ -326,12 +326,12 @@
|
@@ -358,12 +358,12 @@
|
||||||
ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
|
ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
|
||||||
|
|
||||||
sfecho: $(ECHOOBJS) md5lib.o
|
sfecho: $(ECHOOBJS) md5lib.o
|
||||||
|
@ -77,7 +77,7 @@
|
||||||
|
|
||||||
# Configure the voice on demand server for the platform's
|
# Configure the voice on demand server for the platform's
|
||||||
# location of Perl and network constant definitions.
|
# location of Perl and network constant definitions.
|
||||||
@@ -376,11 +376,11 @@
|
@@ -412,11 +412,11 @@
|
||||||
echo "BLOWFISH" >libblowfish.o
|
echo "BLOWFISH" >libblowfish.o
|
||||||
|
|
||||||
libdes.o:
|
libdes.o:
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
--- soundbyte.c.orig Fri Dec 31 15:36:07 1999
|
|
||||||
+++ soundbyte.c Fri Dec 31 15:38:58 1999
|
$FreeBSD$
|
||||||
|
|
||||||
|
--- soundbyte.c.orig Fri Feb 28 23:18:38 2003
|
||||||
|
+++ soundbyte.c Wed Jun 25 19:42:45 2003
|
||||||
@@ -13,7 +13,9 @@
|
@@ -13,7 +13,9 @@
|
||||||
#ifdef Solaris
|
#ifdef Solaris
|
||||||
#include <sys/filio.h>
|
#include <sys/filio.h>
|
||||||
|
@ -10,3 +13,12 @@
|
||||||
#include <sys/file.h>
|
#include <sys/file.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -32,7 +34,7 @@
|
||||||
|
#ifdef LINUX
|
||||||
|
#include <linux/soundcard.h>
|
||||||
|
#else /*!LINUX */
|
||||||
|
-#include <machine/soundcard.h>
|
||||||
|
+#include <sys/soundcard.h>
|
||||||
|
#endif /* LINUX */
|
||||||
|
#endif /* sun */
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue