From 6b10eb1c83f56fa43100c9cc0210a227a55c9cd4 Mon Sep 17 00:00:00 2001 From: prlw1 Date: Tue, 14 Jan 2014 17:07:37 +0000 Subject: Build fixes for new Tcl --- mbone/vic-devel/distinfo | 8 +-- mbone/vic-devel/patches/patch-Makefile.in | 14 +++-- mbone/vic-devel/patches/patch-codec_tmndec_store.c | 13 +++++ mbone/vic-devel/patches/patch-grabber-v4l2.cpp | 2 + mbone/vic-devel/patches/patch-tkStripchart.c | 63 ++++++++++++++++++++++ 5 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 mbone/vic-devel/patches/patch-codec_tmndec_store.c create mode 100644 mbone/vic-devel/patches/patch-tkStripchart.c (limited to 'mbone') diff --git a/mbone/vic-devel/distinfo b/mbone/vic-devel/distinfo index dfdc3052e29..51e5b295117 100644 --- a/mbone/vic-devel/distinfo +++ b/mbone/vic-devel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2013/03/02 18:01:05 joerg Exp $ +$NetBSD: distinfo,v 1.5 2014/01/14 17:07:37 prlw1 Exp $ SHA1 (vic-2.8ucl1.4.0_ov511.diff.gz) = 46faceb1d926820e41ffda71228f63959747a73e RMD160 (vic-2.8ucl1.4.0_ov511.diff.gz) = b60a9d3f5764cc4528dffbf5e9465301d71723de @@ -6,12 +6,14 @@ Size (vic-2.8ucl1.4.0_ov511.diff.gz) = 8646 bytes SHA1 (vic-2.8ucl1.4.0beta-4337.tgz) = 6c15491fa5bdfaedf94731094f8952ed3ff027bb RMD160 (vic-2.8ucl1.4.0beta-4337.tgz) = 631b18fe036c289e5622722e521af2c9735c63da Size (vic-2.8ucl1.4.0beta-4337.tgz) = 9345775 bytes -SHA1 (patch-Makefile.in) = 417c540eb903ace3c5859f21d92556494d52c30d +SHA1 (patch-Makefile.in) = 9f913eee4a9b9bfbf6e5735f04af97cdba92d297 +SHA1 (patch-codec_tmndec_store.c) = 65b7aa01864f428088788b0311a2c88dc7a46914 SHA1 (patch-color-swscale.cpp) = 0796262c5db74cc354ce7f55ae246c489f5c9b33 SHA1 (patch-configure) = 509e31f0e0c1037701d7f012569ac5e5e1e4c033 SHA1 (patch-crypt-rijndael.cpp) = 5dfda8c17c91fa5f6b2df24d4e1ed93bc4ae5b87 -SHA1 (patch-grabber-v4l2.cpp) = e9ef03d31f336976e220291646028916712e71a7 +SHA1 (patch-grabber-v4l2.cpp) = b62fcfdfee0aa7f9515ce1d9ee65b9211873deb7 SHA1 (patch-main.cpp) = 671cda41595f1f5c001b089ee04b5c84f559330a SHA1 (patch-tcl_tcl2cpp_tcl2cpp.c) = 90d7f66a06dfdefebb058da6e688aecb965e3925 +SHA1 (patch-tkStripchart.c) = ab02270a2801684d6d915d268651262e068a9c5c SHA1 (patch-ui-ctrlmenu.tcl) = b81763c2642f3d1eb828cbac4e687c7bf9bc1ba2 SHA1 (patch-ui-resource.tcl) = 1763779af32de2d19b4352eb7174f9edd9f7be16 diff --git a/mbone/vic-devel/patches/patch-Makefile.in b/mbone/vic-devel/patches/patch-Makefile.in index 36cb572d9ba..f7bb3cbdeea 100644 --- a/mbone/vic-devel/patches/patch-Makefile.in +++ b/mbone/vic-devel/patches/patch-Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-Makefile.in,v 1.2 2010/03/08 12:10:07 sborrill Exp $ +$NetBSD: patch-Makefile.in,v 1.3 2014/01/14 17:07:37 prlw1 Exp $ --- Makefile.in.orig 2008-12-10 19:24:48.000000000 +0000 -+++ Makefile.in 2010-03-08 11:54:16.000000000 +0000 -@@ -92,7 +92,7 @@ ++++ Makefile.in +@@ -92,12 +92,12 @@ OBJ_CRYPT = net/crypt-rijndael.o @V_OBJ_ CODEC_LIB = @V_CODEC_LIB@ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_X11@ @V_LIB@ $(CODEC_LIB) $(VIDEO_LIB) \ @@ -11,7 +11,13 @@ $NetBSD: patch-Makefile.in,v 1.2 2010/03/08 12:10:07 sborrill Exp $ INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \ -@@ -349,15 +349,9 @@ + $(INCLUDE_X11) $(MD_INC) -Icodec/jpeg -Icodec/p64 -I. +-DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8 -D_GNU_SOURCE ++DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8 -D_GNU_SOURCE -DUSE_INTERP_RESULT + BFLAGS = $(DEFINE) $(INCLUDE) + CFLAGS = $(CCOPT) $(BFLAGS) + +@@ -349,15 +349,9 @@ ppmtolut: render/ppmtolut/ppmtolut.c $(CC) -o $@ $(CFLAGS) render/ppmtolut/ppmtolut.c -lm $(STATIC) install: force diff --git a/mbone/vic-devel/patches/patch-codec_tmndec_store.c b/mbone/vic-devel/patches/patch-codec_tmndec_store.c new file mode 100644 index 00000000000..56ea8beb1ac --- /dev/null +++ b/mbone/vic-devel/patches/patch-codec_tmndec_store.c @@ -0,0 +1,13 @@ +$NetBSD: patch-codec_tmndec_store.c,v 1.1 2014/01/14 17:07:37 prlw1 Exp $ + +--- codec/tmndec/store.c.orig 2008-12-10 19:23:32.000000000 +0000 ++++ codec/tmndec/store.c +@@ -64,6 +64,8 @@ + #include + #ifdef WIN32 + #include ++#else ++#include + #endif + + #include "config.h" diff --git a/mbone/vic-devel/patches/patch-grabber-v4l2.cpp b/mbone/vic-devel/patches/patch-grabber-v4l2.cpp index 483c26e56f2..712cb080245 100644 --- a/mbone/vic-devel/patches/patch-grabber-v4l2.cpp +++ b/mbone/vic-devel/patches/patch-grabber-v4l2.cpp @@ -1,3 +1,5 @@ +$NetBSD: patch-grabber-v4l2.cpp,v 1.2 2014/01/14 17:07:37 prlw1 Exp $ + --- video/grabber-v4l2.cpp.orig 2008-12-13 22:12:50.000000000 +0000 +++ video/grabber-v4l2.cpp 2008-12-13 22:14:26.000000000 +0000 @@ -34,7 +34,9 @@ diff --git a/mbone/vic-devel/patches/patch-tkStripchart.c b/mbone/vic-devel/patches/patch-tkStripchart.c new file mode 100644 index 00000000000..03648ee6cd1 --- /dev/null +++ b/mbone/vic-devel/patches/patch-tkStripchart.c @@ -0,0 +1,63 @@ +$NetBSD: patch-tkStripchart.c,v 1.1 2014/01/14 17:07:37 prlw1 Exp $ + +--- tkStripchart.c.orig 2008-12-10 19:24:48.000000000 +0000 ++++ tkStripchart.c +@@ -334,17 +334,17 @@ static Tk_ConfigSpec configSpecs[] = + static void Callback(Stripchart* StripchartPtr); + static void ComputeStripchartGeometry(Stripchart* StripchartPtr); //SV-XXX: FreeBSD + static int ConfigureStripchart(Tcl_Interp* interp, Stripchart* StripchartPtr, +- int argc, char** argv, int flags); //SV-XXX: FreeBSD ++ int argc, CONST84 char* argv[], int flags); //SV-XXX: FreeBSD + static void DestroyStripchart(char* clientData); + static void DisplayStripchart(ClientData clientData); + static void DrawStripi(Stripchart* StripchartPtr, int i); + static void EventuallyRedrawStripchart(Stripchart* StripchartPtr, + int displaybits); +-static void ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv); //SV-XXX: FreeBSD ++static void ReplaceColours(Stripchart* StripchartPtr, int argc, CONST84 char* argv[]); //SV-XXX: FreeBSD + static void ScrollStrips(Stripchart* StripchartPtr); + static void StripchartEventProc(ClientData clientData, XEvent* eventPtr); + static int StripchartWidgetCmd(ClientData clientData, Tcl_Interp* interp, +- int argc, char** argv); //SV-XXX: FreeBSD ++ int argc, CONST84 char* argv[]); //SV-XXX: FreeBSD + static void SetStripchartValue(Stripchart* StripchartPtr, double value); + static void SwapColours(Stripchart* StripchartPtr); + +@@ -370,8 +370,9 @@ int + Tk_StripchartCmd(ClientData clientData, Tcl_Interp *interp, int argc, + char **argv) + #else ++int + Tk_StripchartCmd(ClientData clientData, Tcl_Interp *interp, int argc, +- const char **argv) ++ CONST84 char *argv[]) + #endif + { + Tk_Window tkwin = (Tk_Window) clientData; +@@ -427,7 +428,7 @@ Tk_StripchartCmd(ClientData clientData, + */ + static int + StripchartWidgetCmd(ClientData clientData, Tcl_Interp *interp, +- int argc, char **argv) //SV-XXX: FreeBSD ++ int argc, CONST84 char *argv[]) //SV-XXX: FreeBSD + { + register Stripchart *StripchartPtr = (Stripchart*)clientData; + int result = TCL_OK; +@@ -637,7 +638,7 @@ DestroyStripchart(char* clientData) + */ + static int + ConfigureStripchart(Tcl_Interp *interp, Stripchart *StripchartPtr, +- int argc, char** argv, int flags) //SV-XXX: FreeBSD ++ int argc, CONST84 char* argv[], int flags) //SV-XXX: FreeBSD + { + XGCValues gcValues; + GC newGC; +@@ -1048,7 +1049,7 @@ SwapColours(Stripchart * StripchartPtr) + * Stripchart is displayed with the new colour scheme. + */ + static void +-ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv) //SV-XXX: FreeBSD ++ReplaceColours(Stripchart* StripchartPtr, int argc, CONST84 char* argv[]) //SV-XXX: FreeBSD + { + StripchartPtr->altborder = + Tk_Get3DBorder(StripchartPtr->interp, StripchartPtr->tkwin, -- cgit v1.2.3