cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to speak freely 7.1

Browse Source
This commit is contained in:
brad 1999-09-21 15:22:53 +00:00
parent 0dcc624b66
commit 74ada75487
8 changed files with 123 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mbone/speak_freely/Makefile
View File

@ -1,36 +1,23 @@
# $OpenBSD: Makefile,v 1.5 1999/09/21 07:09:56 turan Exp $
# $OpenBSD: Makefile,v 1.6 1999/09/21 15:22:53 brad Exp $
BROKEN= "sources unavailible"
DISTNAME= speak_freely-7.1
CATEGORIES= mbone audio security
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/prior-releases/7.1/
DISTNAME= speak_freely-7.0
CATEGORIES= mbone audio security
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
DEMNS= sfecho sflwld
DDEMNS= sfvod sfreflect
SFLIB= ${PREFIX}/lib/speak_freely
MAKE_ENV= DUPLEX=-DHALF_DUPLEX
do-install:
@if [ ! -d ${SFLIB} ]; then \
install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${SFLIB}; \
fi
@$(INSTALL_DATA) ${WRKSRC}/busy.au ${WRKSRC}/ring.au ${SFLIB}
@for p in ${UTILS}; do \
$(INSTALL_PROGRAM) ${WRKSRC}/$$p ${PREFIX}/bin; \
$(INSTALL_MAN) ${WRKSRC}/$$p.1 ${PREFIX}/man/man1; \
done;
@for p in ${DEMNS}; do \
$(INSTALL_PROGRAM) ${WRKSRC}/$$p ${PREFIX}/sbin; \
$(INSTALL_MAN) ${WRKSRC}/$$p.1 ${PREFIX}/man/man1; \
done;
@for p in ${DDEMNS}; do \
$(INSTALL_SCRIPT) ${WRKSRC}/$$p ${PREFIX}/sbin; \
$(INSTALL_MAN) ${WRKSRC}/$$p.1 ${PREFIX}/man/man1; \
done;
.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "arc" || \
${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "pmax" || ${MACHINE_ARCH} == "sparc")
MAKE_ENV+= CCFLAGS=-DM_LITTLE_ENDIAN
.endif
post-install:
@${MKDIR} ${PREFIX}/lib/speak_freely
@$(INSTALL_DATA) ${WRKSRC}/busy.au ${WRKSRC}/ring.au \
${PREFIX}/lib/speak_freely
.include <bsd.port.mk>

6
mbone/speak_freely/files/md5
View File

@ -1,3 +1,3 @@
MD5 (speak_freely-7.0.tar.gz) = 4f78734809d961c036b6491b1a7fd229
RMD160 (speak_freely-7.0.tar.gz) = 6277c2d14a64dad7afb19236476af9b158f94c56
SHA1 (speak_freely-7.0.tar.gz) = 20bbaf98bba666356507ffb230b7f6d1e3b116ec
MD5 (speak_freely-7.1.tar.gz) = f06e4115c7139f7e30ea57064b324558
RMD160 (speak_freely-7.1.tar.gz) = 5792d405009102a751a36c77c6a614e1ccd9144d
SHA1 (speak_freely-7.1.tar.gz) = 20a728defc70763c90737ccfd2619012acee361e

116
mbone/speak_freely/patches/patch-aa
View File

@ -1,71 +1,91 @@
--- Makefile.orig Sun May 2 10:38:44 1999
+++ Makefile Sat Jun 19 22:55:17 1999
@@ -3,8 +3,8 @@
--- Makefile.orig Sat Sep 18 11:29:44 1999
+++ Makefile Tue Sep 21 10:56:06 1999
@@ -3,20 +3,19 @@
# Debugging options
-DEBUG = -g -DHEXDUMP
-#DEBUG = -O
+#DEBUG = -g -DHEXDUMP
#DEBUG = -g -DHEXDUMP -DNOCRYPTO
#DEBUG = -O
+DEBUG =
# Installation
# Uncomment the appropriate LFLAGS statement below according
# to your machine type.
@@ -26,8 +26,8 @@
# option may speed up certain compression modes. If you get a
# warning about -float being ignored in non -cckr compiles, it
# has no effect on your system.
-CC = cc -signed
-LFLAGS = -laudio -lcurses -lm
+#CC = cc -signed
+#LFLAGS = -laudio -lcurses -lm
# Install program
INSTALL = /usr/bin/install
-# Installation root directory
-INSTDIR = /usr/local
# Binaries
-INSTDIR_BIN = $(INSTDIR)/bin
+INSTDIR_BIN = $(PREFIX)/bin
# Manual pages
-INSTDIR_MAN = $(INSTDIR)/man
+INSTDIR_MAN = $(PREFIX)/man
# ** Linux users please note: many Linux audio drivers are
# half-duplex, even through your sound card may actually
@@ -108,12 +108,15 @@
#CCFLAGS = -DHEWLETT_PACKARD -DOLDCC
#LFLAGS = -lAlib -lcurses -ltermcap -lm
# Uncomment the appropriate CC, CCFLAGS, and LFLAGS statements below
# according to your machine type.
@@ -38,9 +37,9 @@
# functionality is working. Please see the detailed description
# of the available flags which follows these declarations.
#
-CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN
-CC = gcc -O3 # for GNU's gcc compiler
-LFLAGS = -lncurses -lm
+#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN
+#CC = gcc -O3 # for GNU's gcc compiler
+#LFLAGS = -lncurses -lm
#
# If the above LFLAGS doesn't work, try the one below.
#LFLAGS = -lcurses -lm
@@ -223,6 +222,12 @@
#CCFLAGS = -DM_LITTLE_ENDIAN
#LFLAGS = -lcurses -ltermcap -lcompat -lm
+# OpenBSD
+# OpenBSD 2.5
+
+#
+LFLAGS = -L${LOCALBASE}/lib -lcurses -ltermcap -lcompat -lm -lossaudio
+
# Where Perl is located on your system. This is used to make
# a directly-executable version of sfvod.
-PERL = /usr/local/bin/perl
+PERL = /usr/bin/perl
# If your audio hardware is half duplex, uncomment the next line
+#
# Hewlett-Packard
# (courtesy of Marc Kilian)
#
@@ -238,7 +243,7 @@
# If your audio hardware is half duplex, uncomment the next line.
# You can also, if you wish, define this on the CCFLAGS definition
# for your hardware platform.
-#DUPLEX = -DHALF_DUPLEX
+DUPLEX = -DHALF_DUPLEX
+DUPLEX?= -DHALF_DUPLEX
# If your getdomainname() does not return the DNS domainname, define:
#DOMAIN=-DMYDOMAIN=\"somedomain.net\"
@@ -141,7 +144,7 @@
@@ -269,7 +274,7 @@
# Compiler flags
-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)
+CFLAGS += $(DEBUG) -Iadpcm -Ilpc -Imd5 -Iidea -Iblowfish -I/usr/include -I${LOCALBASE}/include $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfreflect sfvod
PROGRAMS = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect sfvod
@@ -150,12 +153,12 @@
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
@@ -278,12 +283,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
sfspeaker: $(SPKROBJS) adpcmlib.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 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
+ $(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
sfspeaker: $(SPKROBJS) adpcmlib.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 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 blowfish/libblowfish.a des/des.a md5/md5.o idea/idea.a lpc10/liblpc10.a -lgsm lpc/lpc.o xdsub.o -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
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
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
+ $(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
- $(CC) $(MIKEOBJS) adpcm/adpcm-u.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 des/des.a md5/md5.o idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a -lgsm lpc/lpc.o -ldes $(LFLAGS) -o sfmike
LWLDOBJS = lwld.o html.o xdsub.o
LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o
@@ -191,11 +194,11 @@
chmod 755 sfvod
@@ -337,11 +342,11 @@
# in make not necessarily available on all platforms.
adpcmlib.o:
- ( echo "Building ADPCM library."; cd adpcm ; make CC="$(CC)" )
@ -78,7 +98,7 @@
echo "DES" >deslib.o
libblowfish.o:
@@ -203,7 +206,6 @@
@@ -349,7 +354,6 @@
echo "BLOWFISH" >libblowfish.o
libdes.o:
@ -86,7 +106,7 @@
echo "LIBDES" >libdes.o
lpclib.o:
@@ -215,15 +217,14 @@
@@ -361,15 +365,14 @@
echo "LPC" >lpc10lib.o
gsmlib.o:
@ -103,4 +123,12 @@
+ ( echo "Building IDEA library."; cd idea ; make CC="$(CC) $(CCFLAGS) $(DEBUG)" )
echo "IDEA" >idealib.o
codecs.o: codecs.c speakfree.h
# Object file dependencies
@@ -462,5 +465,5 @@
# be root to install in system directories.
install: $(PROGRAMS)
- $(INSTALL) -o root -g root -m 755 -s $(PROGRAMS) $(INSTDIR_BIN)
- $(INSTALL) -o root -g root -m 644 *.1 $(INSTDIR_MAN)/man1
+ $(INSTALL) -o root -g wheel -m 755 -s $(PROGRAMS) $(INSTDIR_BIN)
+ $(INSTALL) -o root -g wheel -m 444 *.1 $(INSTDIR_MAN)/man1

6
mbone/speak_freely/patches/patch-ac
View File

@ -1,5 +1,5 @@
--- idea/Makefile.orig Sat Jun 19 21:59:52 1999
+++ idea/Makefile Sat Jun 19 22:00:06 1999
--- idea/Makefile.orig Wed Sep 1 08:06:06 1999
+++ idea/Makefile Tue Sep 21 09:42:31 1999
@@ -6,8 +6,8 @@
# Compiler flags
@ -9,5 +9,5 @@
+#CC = cc
+#CFLAGS = -O
all: idea.o
all: idea.a

6
mbone/speak_freely/patches/patch-ag
View File

@ -1,8 +1,8 @@
--- des/Makefile.orig Sat Jun 19 23:07:21 1999
+++ des/Makefile Sat Jun 19 23:07:28 1999
--- des/Makefile.orig Wed Sep 1 08:02:06 1999
+++ des/Makefile Tue Sep 21 09:43:48 1999
@@ -1,4 +1,4 @@
-CFLAGS=-O
+#CFLAGS=-O
all: des.o
all: des.a

6
mbone/speak_freely/patches/patch-ai
View File

@ -1,12 +1,12 @@
--- mike.c.orig Tue Apr 6 10:50:42 1999
+++ mike.c Sat Jun 19 22:50:40 1999
--- mike.c.orig Tue Sep 14 09:27:51 1999
+++ mike.c Tue Sep 21 09:48:37 1999
@@ -1,4 +1,4 @@
-/*#define USE_CURSES*/
+#define USE_CURSES
#define BYTE_SWAP_DEBUG
/*
@@ -845,6 +845,9 @@
@@ -871,6 +871,9 @@
(sb->buffer.buffer_len > 16)) {
pktlen += sizeof(sb->sendinghost);
}

40
mbone/speak_freely/patches/patch-aj
View File

@ -1,6 +1,6 @@
--- soundbyte.c.orig Sat Jun 19 22:28:53 1999
+++ soundbyte.c Sat Jun 19 22:37:22 1999
@@ -33,6 +33,8 @@
--- soundbyte.c.orig Tue Sep 14 08:55:17 1999
+++ soundbyte.c Tue Sep 21 10:02:41 1999
@@ -30,6 +30,8 @@
#else /* FreeBSD / Linux */
#ifdef LINUX
#include <linux/soundcard.h>
@ -9,7 +9,7 @@
#else
#include <machine/soundcard.h>
#endif
@@ -62,6 +64,14 @@
@@ -63,6 +65,14 @@
#define MAX_GAIN 100
@ -24,51 +24,51 @@
struct sound_buf {
struct sound_buf *snext; /* Next sound buffer */
int sblen; /* Length of this sound buffer */
@@ -178,6 +188,21 @@
}
@@ -290,6 +300,21 @@
#endif
ioctl(Audio_fd, AUDIO_SETINFO, &Audio_info);
#endif
+#ifndef sun
+#ifdef HALF_DUPLEX
+ if (iomode == O_RDONLY) {
+#ifndef sun
+#ifdef HALF_DUPLEX
+ if (iomode == O_RDONLY) {
+ if (oldvol == -1)
+ oldvol = soundgetvol();
+ soundplayvol(0);
+ } else if ( iomode == O_WRONLY
+ } 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 @@
@@ -305,6 +330,15 @@
void soundterm()
{
if (audiof >= 0) {
if ((!neverRelease) && (audiof >= 0)) {
+#ifndef sun
+#ifdef HALF_DUPLEX
+ if (oldvol != -1) {
+ if (soundgetvol() == 0)
+ soundplayvol(oldvol);
+ oldvol = -1;
+ }
+ if (oldvol != -1) {
+ if (soundgetvol() == 0)
+ soundplayvol(oldvol);
+ oldvol = -1;
+ }
+#endif
+#endif
if (close(audiof) < 0) {
perror("closing audio device");
}
@@ -243,10 +277,30 @@
@@ -382,10 +416,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)
+ if (ioctl(Audio_fd, MIXER_WRITE(SOUND_MIXER_WRITE_PCM), &arg) < 0)
+ perror("SOUND_MIXER_WRITE_PCM");
#endif
}

8
mbone/speak_freely/pkg/PLIST
View File

@ -1,10 +1,10 @@
bin/sfecho
bin/sfspeaker
bin/sfmike
bin/sflwl
sbin/sfecho
sbin/sflwld
sbin/sfvod
sbin/sfreflect
bin/sflwld
bin/sfvod
bin/sfreflect
lib/speak_freely/ring.au
lib/speak_freely/busy.au
man/man1/sfecho.1