summaryrefslogtreecommitdiff
path: root/mbone
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-11-29 03:41:33 +0000
committerSteve Price <steve@FreeBSD.org>1999-11-29 03:41:33 +0000
commit59e4b7969b5077ac3a8a9f8eed7dc8dbe52e127d (patch)
tree3c800c34ec624a89ef5d66304b64d747897866c1 /mbone
parentAdd the elided text patch from the TkMan distribution. (diff)
Update to Tcl/Tk version 8.2 and get this to build with gcc 2.95.
Submitted by: Ade Lovett <ade@lovett.com>
Notes
Notes: svn path=/head/; revision=23483
Diffstat (limited to 'mbone')
-rw-r--r--mbone/vic/Makefile4
-rw-r--r--mbone/vic/files/patch-aa82
-rw-r--r--mbone/vic/files/patch-ag27
-rw-r--r--mbone/vic/files/patch-am16
-rw-r--r--mbone/vic/files/patch-an20
-rw-r--r--mbone/vic/files/patch-ao11
-rw-r--r--mbone/vic/files/patch-ap11
-rw-r--r--mbone/vic/files/patch-aq11
-rw-r--r--mbone/vic/files/patch-ar11
-rw-r--r--mbone/vic/files/patch-as11
-rw-r--r--mbone/vic/files/patch-at11
-rw-r--r--mbone/vic/files/patch-au11
-rw-r--r--mbone/vic/files/patch-av20
-rw-r--r--mbone/vic/files/patch-aw20
-rw-r--r--mbone/vic/files/patch-ax11
15 files changed, 219 insertions, 58 deletions
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index db0ffffa4101..e759aaefda59 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -7,13 +7,13 @@
#
DISTNAME= vic-2.8
-CATEGORIES= mbone tk80
+CATEGORIES= mbone tk82
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/
DISTFILES= vicsrc-2.8.tar.gz
MAINTAINER= fenner@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
USE_AUTOCONF= yes
USE_X_PREFIX= yes
diff --git a/mbone/vic/files/patch-aa b/mbone/vic/files/patch-aa
index 567da523ab66..894a1a82b091 100644
--- a/mbone/vic/files/patch-aa
+++ b/mbone/vic/files/patch-aa
@@ -46,8 +46,8 @@
fi
- places="$d/lib/libtcl7.5.so \
- $d/lib/libtcl7.5.a \
-+ places="$d/lib/libtcl8.0.so \
-+ $d/lib/libtcl8.0.a \
++ places="$d/lib/libtcl8.2.so \
++ $d/lib/libtcl8.2.a \
$d/lib/libtcl.so \
$d/lib/libtcl.a"
V_LIB_TCL=FAIL
@@ -56,7 +56,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
@@ -67,14 +67,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
@@ -83,7 +83,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="\
@@ -94,15 +94,15 @@
- $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
- V_LIB_TCL="-L$dir -ltcl7.5"
-+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then
-+ V_LIB_TCL="-L$dir -ltcl80"
++ if test -r $dir/libtcl82.so -o -r $dir/libtcl82.a; then
++ V_LIB_TCL="-L$dir -ltcl82"
break
fi
if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
@@ -117,13 +117,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/lib/tk/tcl \
@@ -133,8 +133,8 @@
fi
- places="$d/lib/libtk4.1.so \
- $d/lib/libtk4.1.a \
-+ places="$d/lib/libtk8.0.so \
-+ $d/lib/libtk8.0.a \
++ places="$d/lib/libtk8.2.so \
++ $d/lib/libtk8.2.a \
$d/lib/libtk.so \
$d/lib/libtk.a"
V_LIB_TK=FAIL
@@ -143,7 +143,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
@@ -156,7 +156,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\
@@ -165,9 +165,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
@@ -176,7 +176,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="-ltk8.0", 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 \
@@ -186,15 +186,15 @@
/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
- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
- V_LIB_TK="-L$dir -ltk4.1"
-+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then
-+ V_LIB_TK="-L$dir -ltk80"
++ if test -r $dir/libtk82.so -o -r $dir/libtk82.a; then
++ V_LIB_TK="-L$dir -ltk82"
break
fi
if test -r $dir/libtk.so -o -r $dir/libtk.a; then
@@ -211,15 +211,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/mbone/vic/files/patch-ag b/mbone/vic/files/patch-ag
index 17380d8c165e..c597e4f3e86b 100644
--- a/mbone/vic/files/patch-ag
+++ b/mbone/vic/files/patch-ag
@@ -85,13 +85,10 @@
int encode(const VideoFrame*, const u_int8_t *crvec);
int command(int argc, const char*const* argv);
void encode_blk(const short* blk, const char* lm);
-@@ -208,6 +209,16 @@
- for (int q = 0; q < 32; ++q) {
- llm_[q] = 0;
- clm_[q] = 0;
-+ }
-+}
-+
+@@ -211,6 +212,16 @@
+ }
+ }
+
+H261Encoder::~H261Encoder()
+{
+ for (int q = 0; q < 32; ++q) {
@@ -99,6 +96,18 @@
+ delete llm_[q];
+ if (clm_[q] != 0)
+ delete clm_[q];
- }
- }
++ }
++}
++
+ H261PixelEncoder::H261PixelEncoder() : H261Encoder(FT_YUV_CIF)
+ {
+ quant_required_ = 0;
+@@ -631,7 +642,7 @@
+ if (q < 8) {
+ register int cmin = 0, cmax = 0;
+ register short* bp = lblk;
+- register i, j;
++ register int i, j;
+ // Y U and V blocks
+ for (i = 6; --i >= 0; ) {
diff --git a/mbone/vic/files/patch-am b/mbone/vic/files/patch-am
index e270b5c42e78..12a6862d6ec1 100644
--- a/mbone/vic/files/patch-am
+++ b/mbone/vic/files/patch-am
@@ -1,6 +1,6 @@
---- grabber-x11.cc.orig Thu Sep 9 06:57:14 1999
-+++ grabber-x11.cc Wed Sep 8 21:31:27 1999
-@@ -0,0 +1,1398 @@
+--- grabber-x11.cc.orig Sun Nov 28 19:11:13 1999
++++ grabber-x11.cc Sun Nov 28 19:59:33 1999
+@@ -0,0 +1,1402 @@
+/*
+ * Copyright (c) 1998 Luigi Rizzo
+ * grabber-x11.cc for vic
@@ -49,6 +49,7 @@
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/cursorfont.h>
++#include <X11/extensions/XShm.h>
+#include <tk.h>
+/*** #include "sized_types.h" ***/
+
@@ -162,8 +163,8 @@
+
+
+ uint8 *rgb2y_ ;
-+ int8 *rgb2u_ ;
-+ int8 *rgb2v_ ;
++ uint8 *rgb2u_ ;
++ uint8 *rgb2v_ ;
+
+ ximage_t *ximage_ ;
+
@@ -591,6 +592,10 @@
+ return 1;
+}
+
++extern "C" {
++extern void VidUtil_DestroyXImage(Display *dpy, ximage_t *ximage);
++};
++
+/*
+ * initialization of frame grabber...
+ */
@@ -691,7 +696,6 @@
+
+extern "C" {
+extern void VidUtil_Init(Display *dpy);
-+extern void VidUtil_DestroyXImage(Display *dpy, ximage_t *ximage);
+
+#ifdef UNUSED /* not yet... */
+static int
diff --git a/mbone/vic/files/patch-an b/mbone/vic/files/patch-an
new file mode 100644
index 000000000000..84a0fec07788
--- /dev/null
+++ b/mbone/vic/files/patch-an
@@ -0,0 +1,20 @@
+--- iohandler.cc.orig Sun Nov 28 19:12:12 1999
++++ iohandler.cc Sun Nov 28 19:12:50 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
diff --git a/mbone/vic/files/patch-ao b/mbone/vic/files/patch-ao
new file mode 100644
index 000000000000..1e599f570a0b
--- /dev/null
+++ b/mbone/vic/files/patch-ao
@@ -0,0 +1,11 @@
+--- transcoder-jpeg.cc.orig Sun Nov 28 19:15:40 1999
++++ transcoder-jpeg.cc Sun Nov 28 19:15:57 1999
+@@ -138,7 +138,7 @@
+ rval = target_->consume(df);
+
+ // update CR vec
+- register blkno;
++ register int blkno;
+ int s;
+ for (blkno = 0; blkno < crvlen_; blkno++) {
+ s = CR_STATE(crvec_[blkno]);
diff --git a/mbone/vic/files/patch-ap b/mbone/vic/files/patch-ap
new file mode 100644
index 000000000000..1e8630a55330
--- /dev/null
+++ b/mbone/vic/files/patch-ap
@@ -0,0 +1,11 @@
+--- color-true.cc.orig Sun Nov 28 19:17:03 1999
++++ color-true.cc Sun Nov 28 19:17:23 1999
+@@ -180,7 +180,7 @@
+ protected:
+ TrueColorModel& cm_;
+ virtual void update();
+- virtual void disable() { method_ = TrueMethod(WindowRenderer::dither_null); }
++ virtual void disable() { method_ = TrueMethod(&WindowRenderer::dither_null); }
+ TrueMethod method_;
+ void map_422(const u_char* frm, u_int off, u_int x,
+ u_int width, u_int height) const;
diff --git a/mbone/vic/files/patch-aq b/mbone/vic/files/patch-aq
new file mode 100644
index 000000000000..a1b6dc6039cd
--- /dev/null
+++ b/mbone/vic/files/patch-aq
@@ -0,0 +1,11 @@
+--- color-dither.cc.orig Sun Nov 28 19:18:04 1999
++++ color-dither.cc Sun Nov 28 19:18:21 1999
+@@ -177,7 +177,7 @@
+ protected:
+ DitherColorModel& cm_;
+ virtual void update();
+- virtual void disable() { method_ = PseudoWindowRenderer::dither_null; }
++ virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
+ DitherMethod method_;
+ void dither_422(const u_char* frm, u_int off, u_int x,
+ u_int width, u_int height) const;
diff --git a/mbone/vic/files/patch-ar b/mbone/vic/files/patch-ar
new file mode 100644
index 000000000000..afb6bf05058e
--- /dev/null
+++ b/mbone/vic/files/patch-ar
@@ -0,0 +1,11 @@
+--- color-ed.cc.orig Sun Nov 28 19:18:55 1999
++++ color-ed.cc Sun Nov 28 19:19:12 1999
+@@ -180,7 +180,7 @@
+ protected:
+ EDColorModel& cm_;
+ virtual void update();
+- virtual void disable() { method_ = PseudoWindowRenderer::dither_null; }
++ virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
+ EDMethod method_;
+ void dither_422(const u_char* frm, u_int off, u_int x,
+ u_int width, u_int height) const;
diff --git a/mbone/vic/files/patch-as b/mbone/vic/files/patch-as
new file mode 100644
index 000000000000..6df97f7ce4b3
--- /dev/null
+++ b/mbone/vic/files/patch-as
@@ -0,0 +1,11 @@
+--- color-quant.cc.orig Sun Nov 28 19:19:44 1999
++++ color-quant.cc Sun Nov 28 19:20:01 1999
+@@ -92,7 +92,7 @@
+ protected:
+ QuantColorModel& cm_;
+ virtual void update();
+- virtual void disable() { method_ = PseudoWindowRenderer::dither_null; }
++ virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
+ QuantMethod method_;
+ void map_422(const u_char* frm, u_int off, u_int x,
+ u_int width, u_int height) const;
diff --git a/mbone/vic/files/patch-at b/mbone/vic/files/patch-at
new file mode 100644
index 000000000000..4f240f31a290
--- /dev/null
+++ b/mbone/vic/files/patch-at
@@ -0,0 +1,11 @@
+--- color-hi.cc.orig Sun Nov 28 19:20:41 1999
++++ color-hi.cc Sun Nov 28 19:21:03 1999
+@@ -164,7 +164,7 @@
+ protected:
+ HiColorModel& cm_;
+ virtual void update();
+- virtual void disable() { method_ = HiMethod(WindowRenderer::dither_null); }
++ virtual void disable() { method_ = HiMethod(&WindowRenderer::dither_null); }
+ HiMethod method_;
+ void map_422(const u_char* frm, u_int off, u_int x,
+ u_int width, u_int height) const;
diff --git a/mbone/vic/files/patch-au b/mbone/vic/files/patch-au
new file mode 100644
index 000000000000..7236620e179d
--- /dev/null
+++ b/mbone/vic/files/patch-au
@@ -0,0 +1,11 @@
+--- color-gray.cc.orig Sun Nov 28 19:21:35 1999
++++ color-gray.cc Sun Nov 28 19:21:47 1999
+@@ -82,7 +82,7 @@
+ }
+ protected:
+ virtual void update();
+- virtual void disable() { method_ = PseudoWindowRenderer::dither_null; }
++ virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
+ GrayMethod method_;
+ };
+
diff --git a/mbone/vic/files/patch-av b/mbone/vic/files/patch-av
new file mode 100644
index 000000000000..d8530eb58794
--- /dev/null
+++ b/mbone/vic/files/patch-av
@@ -0,0 +1,20 @@
+--- color-mono.cc.orig Sun Nov 28 19:22:19 1999
++++ color-mono.cc Sun Nov 28 19:22:51 1999
+@@ -200,7 +200,7 @@
+ ~MonoColorModel();
+ virtual int alloc_grays();
+ virtual int command(int argc, const char*const* argv);
+- inline white(void) { return (white_); }
++ inline int white(void) { return (white_); }
+ private:
+ int white_;
+ };
+@@ -250,7 +250,7 @@
+ protected:
+ MonoColorModel& cm_;
+ virtual void update();
+- virtual void disable() { method_ = WindowDitherer::dither_null; }
++ virtual void disable() { method_ = &WindowDitherer::dither_null; }
+ MonoMethod method_;
+ void dither(const u_char* frm, u_int off, u_int x,
+ u_int width, u_int height) const;
diff --git a/mbone/vic/files/patch-aw b/mbone/vic/files/patch-aw
new file mode 100644
index 000000000000..52e1ffd9c1e3
--- /dev/null
+++ b/mbone/vic/files/patch-aw
@@ -0,0 +1,20 @@
+--- jpeg/jpeg.cc.orig Sun Nov 28 19:23:29 1999
++++ jpeg/jpeg.cc Sun Nov 28 19:23:52 1999
+@@ -139,7 +139,7 @@
+ dct_unbias_ = 1;
+
+ short *sp = (short *)frm_;
+- for (register i = 0; i < n / (BMB * 64) ; i++) {
++ for (register int i = 0; i < n / (BMB * 64) ; i++) {
+ *sp = DCT_GRAY;
+ sp += 64;
+ *sp = DCT_GRAY;
+@@ -173,7 +173,7 @@
+ dct_unbias_ = 1;
+
+ short *sp = (short*)frm_;
+- for (register i = 0; i < n / (BMB * 64) ; i++) {
++ for (register int i = 0; i < n / (BMB * 64) ; i++) {
+ *sp = DCT_GRAY;
+ sp += 64;
+ *sp = DCT_GRAY;
diff --git a/mbone/vic/files/patch-ax b/mbone/vic/files/patch-ax
new file mode 100644
index 000000000000..477fa0bbbc4c
--- /dev/null
+++ b/mbone/vic/files/patch-ax
@@ -0,0 +1,11 @@
+--- p64/mkhuff.cc.orig Sun Nov 28 19:24:42 1999
++++ p64/mkhuff.cc Sun Nov 28 19:25:49 1999
+@@ -45,6 +45,8 @@
+ extern "C" {
+ int getopt(int, char * const *, const char *);
+ }
++#else
++#include <unistd.h>
+ #endif
+ #define HUFFSTRINGS
+ #include "p64-huff.h"