diff options
author | Steve Price <steve@FreeBSD.org> | 1999-11-29 03:43:04 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1999-11-29 03:43:04 +0000 |
commit | 6196aa73a8cde7d81726e15bb4daf18f48a610ab (patch) | |
tree | 358ea7aa18d474534f44b97952c25f6a9d84191d /audio/vat | |
parent | Update to Tcl/Tk version 8.2 and get this to build with gcc 2.95. (diff) |
Update to Tcl/Tk version 8.2 and fix for gcc 2.95.
Submitted by: Ade Lovett <ade@lovett.com>
Notes
Notes:
svn path=/head/; revision=23484
Diffstat (limited to 'audio/vat')
-rw-r--r-- | audio/vat/Makefile | 4 | ||||
-rw-r--r-- | audio/vat/files/patch-aa | 72 | ||||
-rw-r--r-- | audio/vat/files/patch-ae | 14 | ||||
-rw-r--r-- | audio/vat/files/patch-ah | 16 | ||||
-rw-r--r-- | audio/vat/files/patch-ai | 20 |
5 files changed, 79 insertions, 47 deletions
diff --git a/audio/vat/Makefile b/audio/vat/Makefile index b86d3a91debf..667d2d408c35 100644 --- a/audio/vat/Makefile +++ b/audio/vat/Makefile @@ -7,7 +7,7 @@ # DISTNAME= vat-4.0b2 -CATEGORIES= mbone tk80 +CATEGORIES= mbone tk82 MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/ DISTFILES= vatsrc-4.0b2.tar.gz @@ -20,7 +20,7 @@ GSM_WORK= ${WRKDIRPREFIX}${GSM_DIR}/work/gsm-1.0-pl10 # we can use this first BUILD_DEPENDS and save some work. #BUILD_DEPENDS= ${GSM_WORK}/inc/private.h:${GSM_DIR}:patch BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \ +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ gsm.1:${GSM_DIR} USE_X_PREFIX= yes diff --git a/audio/vat/files/patch-aa b/audio/vat/files/patch-aa index 4d6f3334a4b8..0937d2d2a5bc 100644 --- a/audio/vat/files/patch-aa +++ b/audio/vat/files/patch-aa @@ -1,10 +1,10 @@ --- configure.in.tk.orig Thu May 16 01:06:05 1996 +++ configure.in.tk Tue Sep 9 11:35:45 1997 @@ -2,6 +2,7 @@ - dnl $Header: /home/ncvs/ports/mbone/vat/patches/patch-aa,v 1.2 1997/09/11 03:54:50 fenner Exp $ (LBL) + dnl $Header: /home/ncvs/ports/mbone/vat/patches/patch-aa,v 1.3 1998/06/26 19:05:34 fenner Exp $ (LBL) AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="") -+tclposs="tcl8.0 tcl80 tcl" ++tclposs="tcl8.2 tcl82 tcl" if test "$d" != "" ; then if test ! -d $d ; then echo "'$d' is not a directory" @@ -36,7 +36,7 @@ exit 1 fi - places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.0 \ ++ places="$d/lib/tcl8.2 \ $d/lib/tcl" V_LIBRARY_TCL=FAIL for dir in $places; do @@ -47,14 +47,14 @@ - places="$PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/include/tcl7.5 \ -+ places="$PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/include/tcl8.0 \ ++ places="$PWD/../tcl8.2 \ ++ /usr/src/local/tcl8.2 \ ++ /import/tcl/include/tcl8.2 \ $prefix/include \ $x_includes/tk \ $x_includes \ /usr/local/include \ -+ /usr/local/include/tcl8.0 \ ++ /usr/local/include/tcl8.2 \ /usr/contrib/include \ /usr/include" for dir in $places; do @@ -63,7 +63,7 @@ fi fi - AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL") -+ AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL") ++ AC_CHECK_LIB(tcl8.2, main, V_LIB_TCL="-ltcl8.2", V_LIB_TCL="FAIL") if test "$V_LIB_TCL" = FAIL; then echo "checking for libtcl.a" places="\ @@ -74,9 +74,9 @@ - $PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ ++ $PWD/../tcl8.2 \ ++ /usr/src/local/tcl8.2 \ ++ /import/tcl/lib/tcl8.2 \ " for dir in $places; do - if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then @@ -110,13 +110,13 @@ - /import/tcl/lib/tcl7.5 \ - $prefix/lib/tcl7.5 \ - $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.0 \ -+ /usr/contrib/lib/tcl8.0 \ -+ /usr/lib/tcl8.0 \ -+ /usr/lib/tk/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ -+ $prefix/lib/tcl8.0 \ -+ $x_libraries/tcl8.0 \ ++ places="/usr/local/lib/tcl8.2 \ ++ /usr/contrib/lib/tcl8.2 \ ++ /usr/lib/tcl8.2 \ ++ /usr/lib/tk/tcl8.2 \ ++ /import/tcl/lib/tcl8.2 \ ++ $prefix/lib/tcl8.2 \ ++ $x_libraries/tcl8.2 \ /usr/local/lib/tcl \ /usr/lib/tcl \ + /usr/libdata/tcl \ @@ -127,7 +127,7 @@ AC_SUBST(V_LIBRARY_TCL) AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="") -+tkposs="tk8.0 tk80 tk" ++tkposs="tk8.2 tk82 tk" if test "$d" != "" ; then if test ! -d $d ; then echo "'$d' is not a directory" @@ -159,7 +159,7 @@ exit 1 fi - places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.0 \ ++ places="$d/lib/tk8.2 \ $d/lib/tk" V_LIBRARY_TK=FAIL for dir in $places; do @@ -167,7 +167,7 @@ places="\ $prefix/include \ /usr/local/include \ -+ /usr/local/include/tk8.0 \ ++ /usr/local/include/tk8.2 \ /usr/contrib/include \ /usr/include/tcl \ /usr/include\ @@ -176,9 +176,9 @@ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ - /import/tcl/include/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ -+ /import/tcl/include/tk8.0 \ ++ $PWD/../tk8.2 \ ++ /usr/src/local/tk8.2 \ ++ /import/tcl/include/tk8.2 \ " for dir in $places; do if test -r $dir/tk.h ; then @@ -187,7 +187,7 @@ fi fi - AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL") -+ AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL") ++ AC_CHECK_LIB(tk8.2, main, V_LIB_TK="-ltk8.2", V_LIB_TK="FAIL") if test "$V_LIB_TK" = FAIL; then echo "checking for libtk.a" places="/usr/local/lib \ @@ -197,8 +197,8 @@ /import/tcl/lib \ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ ++ $PWD/../tk8.2 \ ++ /usr/src/local/tk8.2 \ $prefix/lib \ $x_libraries" for dir in $places; do @@ -235,15 +235,15 @@ - $x_libraries/tk4.1 \ - $PWD/../tk4.1/library \ - /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.0 \ -+ /usr/contrib/lib/tk8.0 \ -+ /usr/lib/tk8.0 \ -+ /usr/lib/tk/tk8.0 \ -+ /import/tcl/lib/tk8.0 \ -+ $prefix/lib/tk8.0 \ -+ $x_libraries/tk8.0 \ -+ $PWD/../tk8.0/library \ -+ /usr/src/local/tk8.0/library \ ++ places="/usr/local/lib/tk8.2 \ ++ /usr/contrib/lib/tk8.2 \ ++ /usr/lib/tk8.2 \ ++ /usr/lib/tk/tk8.2 \ ++ /import/tcl/lib/tk8.2 \ ++ $prefix/lib/tk8.2 \ ++ $x_libraries/tk8.2 \ ++ $PWD/../tk8.2/library \ ++ /usr/src/local/tk8.2/library \ /usr/local/lib/tk \ /usr/lib/tk \ /usr/lib/tk/tk \ diff --git a/audio/vat/files/patch-ae b/audio/vat/files/patch-ae index 0dd64688bdeb..6ac2e51801f1 100644 --- a/audio/vat/files/patch-ae +++ b/audio/vat/files/patch-ae @@ -55,7 +55,7 @@ int n = strlen(s); --- sitebox.cc.orig 1997/01/07 22:48:27 +++ sitebox.cc 1997/01/07 23:27:35 -@@ -228,6 +228,10 @@ +@@ -230,6 +230,10 @@ Site::~Site() { @@ -66,4 +66,14 @@ } int Site::command(int argc, const char*const* argv) - +@@ -638,8 +642,8 @@ + need_sort_ = 0; + + Tcl& tcl = Tcl::instance(); +- Tk_Uid fg = mono()? "black" : (char*)tcl.attr("foreground"); +- Tk_Uid bg = mono()? "white" : (char*)tcl.attr("background"); ++ Tk_Uid fg = mono()? (char*)"black" : (char*)tcl.attr("foreground"); ++ Tk_Uid bg = mono()? (char*)"white" : (char*)tcl.attr("background"); + fg_ = lookup_gc(0, fg, bg); + bg_ = lookup_gc(0, bg, bg); + } diff --git a/audio/vat/files/patch-ah b/audio/vat/files/patch-ah index 69d5e6314f7f..06d8512f9daa 100644 --- a/audio/vat/files/patch-ah +++ b/audio/vat/files/patch-ah @@ -7,7 +7,7 @@ * Copyright (c) 1991-1993 Regents of the University of California. * All rights reserved. * -@@ -35,29 +37,37 @@ +@@ -35,29 +37,41 @@ -#include <string.h> -#include <sys/fcntl.h> @@ -19,6 +19,7 @@ -#include <sys/types.h> -#include <sys/uio.h> -#include <unistd.h> +-#include <machine/soundcard.h> + +/* + * Full Duplex audio module for the new sound driver and full duplex @@ -35,11 +36,13 @@ + * but the code should compile with the old driver as well. + */ + ++#if !defined(__FreeBSD__) || (__FreeBSD__ < 4) +#include <osfcn.h> - #include <machine/soundcard.h> --#else + #else -#include <sys/soundcard.h> --#endif ++#include <fcntl.h> + #endif ++#include <machine/soundcard.h> #include "audio.h" +#include "mulaw.h" #include "Tcl.h" @@ -61,7 +64,7 @@ virtual int FrameReady(); virtual u_char* Read(); virtual void Write(u_char *); -@@ -66,163 +76,400 @@ +@@ -66,163 +80,400 @@ virtual void OutputPort(int); virtual void InputPort(int); virtual void Obtain(); @@ -594,7 +597,7 @@ diff -ubwr old/bitmaps/linein3.xbm bitmaps/linein3.xbm @@ -1,11 +1,11 @@ #define linein3_width 30 #define linein3_height 24 --static char linein3_bits[] = { + static char linein3_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, - 0x00, 0x80, 0xff, 0x00, 0x00, 0xe0, 0xc1, 0x03, 0x00, 0x70, 0x04, 0x07, - 0x00, 0x30, 0x0c, 0x06, 0x00, 0x18, 0x18, 0x0c, 0x00, 0x18, 0x30, 0x0c, @@ -603,7 +606,6 @@ diff -ubwr old/bitmaps/linein3.xbm bitmaps/linein3.xbm - 0x18, 0x18, 0x18, 0x0c, 0x24, 0x30, 0x0c, 0x06, 0x20, 0x70, 0x04, 0x07, - 0x18, 0xe0, 0xc1, 0x03, 0x10, 0x80, 0xff, 0x00, 0x20, 0x00, 0x3e, 0x00, - 0x24, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -+static unsigned char linein3_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x7c, 0x1b, 0x3e, 0x00, 0x0c, 0x1b, 0x06, 0x00, + 0x0c, 0x1b, 0x06, 0x00, 0x3c, 0x1b, 0x1e, 0x00, 0x0c, 0x1b, 0x06, 0x00, + 0x0c, 0x1b, 0x06, 0x00, 0x0c, 0xfb, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/audio/vat/files/patch-ai b/audio/vat/files/patch-ai new file mode 100644 index 000000000000..15a8677d87c7 --- /dev/null +++ b/audio/vat/files/patch-ai @@ -0,0 +1,20 @@ +--- iohandler.cc.orig Sun Nov 28 18:49:59 1999 ++++ iohandler.cc Sun Nov 28 18:50:46 1999 +@@ -132,7 +132,7 @@ + + } + #else +- Tk_CreateFileHandler((ClientData)fd, mask, callback, (ClientData)this); ++ Tk_CreateFileHandler(fd, mask, callback, (ClientData)this); + #endif + } + +@@ -151,7 +151,7 @@ + } + #else + if (fd_ >= 0) { +- Tk_DeleteFileHandler((ClientData)fd_); ++ Tk_DeleteFileHandler(fd_); + fd_ = -1; + } + #endif |