mirror of
https://git.freebsd.org/ports.git
synced 2025-05-25 07:26:29 -04:00
Look for -luclmmbase under LOCALBASE instead of PREFIX (which is
X11BASE). Submitted by: pointyhat via kris While here fix some more of the warnings, use OpenSSL's MD5 code instead of vendor's own copy, and use srandomdev instead of srandom(hostname+time). Approved by: portmgr (Kirill)
This commit is contained in:
parent
490d9d0dd1
commit
adc194756f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=131906
12 changed files with 352 additions and 64 deletions
|
@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-2.8ucl1.1.6
|
|||
MAINTAINER= mi@aldan.algebra.com
|
||||
COMMENT= MBONE video tool
|
||||
|
||||
LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
|
||||
LIB_DEPENDS= tk84:${PORTSDIR}/x11-toolkits/tk84 \
|
||||
uclmmbase:${PORTSDIR}/devel/uclmmbase
|
||||
|
||||
USE_AUTOCONF_VER= 213
|
||||
|
@ -28,6 +28,9 @@ CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \
|
|||
-enable-ipv6
|
||||
MAN1= vic.1
|
||||
|
||||
post-patch:
|
||||
${RM} ${WRKSRC}/md5*
|
||||
|
||||
post-install:
|
||||
${STRIP_CMD} ${PREFIX}/bin/vic
|
||||
${STRIP_CMD} ${PREFIX}/bin/histtolut
|
||||
|
|
|
@ -1,20 +1,17 @@
|
|||
--- Makefile.in Wed Apr 30 07:50:17 2003
|
||||
+++ Makefile.in Thu Sep 23 18:42:54 2004
|
||||
@@ -58,7 +58,7 @@
|
||||
INCLUDE_TK = @V_INCLUDE_TK@
|
||||
+++ Makefile.in Tue Mar 22 13:18:58 2005
|
||||
@@ -59,5 +59,5 @@
|
||||
INCLUDE_TCL = @V_INCLUDE_TCL@
|
||||
INCLUDE_X11 = @V_INCLUDE_X11@
|
||||
-INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src
|
||||
+INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I@prefix@/include/uclmmbase
|
||||
+INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I${LOCALBASE}/include/uclmmbase
|
||||
|
||||
STATIC = @V_STATIC@
|
||||
MKDEP = ./mkdep
|
||||
@@ -89,12 +89,12 @@
|
||||
OBJ_XIL = @V_OBJ_XIL@
|
||||
@@ -90,10 +90,10 @@
|
||||
OBJ_CRYPT = @V_OBJ_CRYPT@
|
||||
LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_X11@ @V_LIB@ \
|
||||
- codec/tmndec/libh263.a codec/tmn-x/libh263coder.a ../common/src/libuclmmbase.a -lm
|
||||
+ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a -L@prefix@/lib -luclmmbase -lm
|
||||
+ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a -L${LOCALBASE}/lib -luclmmbase -lm
|
||||
INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \
|
||||
$(INCLUDE_X11) $(MD_INC) -Icodec/jpeg -Icodec/p64 -I.
|
||||
DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8
|
||||
|
@ -23,18 +20,31 @@
|
|||
+CFLAGS += $(BFLAGS)
|
||||
|
||||
#
|
||||
# Remember to add a dependency if you add any tcl sources here.
|
||||
@@ -333,7 +333,7 @@
|
||||
chown bin @prefix@/bin/vic
|
||||
chgrp bin @prefix@/bin/vic
|
||||
chmod 555 @prefix@/bin/vic
|
||||
- cp vic.1 @prefix@/man/vic.1
|
||||
+ cp vic.1 @prefix@/man/man1/vic.1
|
||||
cp histtolut @prefix@/bin/histtolut
|
||||
chown bin @prefix@/bin/histtolut
|
||||
chgrp bin @prefix@/bin/histtolut
|
||||
@@ -410,7 +410,7 @@
|
||||
@@ -123,5 +123,5 @@
|
||||
|
||||
# .c objects
|
||||
-OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o md5c.o random.o \
|
||||
+OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o \
|
||||
$(H263_OBJS)
|
||||
# session-rtpv1.o session-nv.o session-ivs.o # Not supported anymore
|
||||
@@ -330,13 +330,7 @@
|
||||
|
||||
install: force
|
||||
- cp vic @prefix@/bin/vic
|
||||
- chown bin @prefix@/bin/vic
|
||||
- chgrp bin @prefix@/bin/vic
|
||||
- chmod 555 @prefix@/bin/vic
|
||||
- cp vic.1 @prefix@/man/vic.1
|
||||
- cp histtolut @prefix@/bin/histtolut
|
||||
- chown bin @prefix@/bin/histtolut
|
||||
- chgrp bin @prefix@/bin/histtolut
|
||||
- chmod 555 @prefix@/bin/histtolut
|
||||
+ ${BSD_INSTALL_PROGRAM} vic @prefix@/bin/vic
|
||||
+ ${BSD_INSTALL_MAN} vic.1 @prefix@/man/man1/vic.1
|
||||
+ ${BSD_INSTALL_PROGRAM} histtolut @prefix@/bin/histtolut
|
||||
|
||||
clean:
|
||||
@@ -411,6 +405,6 @@
|
||||
|
||||
codec/tmn-x/libh263coder.a:
|
||||
- (cd codec/tmn-x; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" )
|
||||
|
|
|
@ -1,21 +1,62 @@
|
|||
--- tkStripchart.c Mon Jun 29 15:17:00 1998
|
||||
+++ tkStripchart.c Thu Sep 23 18:50:39 2004
|
||||
--- tkStripchart.c.orig Mon Jun 29 15:17:00 1998
|
||||
+++ tkStripchart.c Tue Mar 22 13:02:03 2005
|
||||
@@ -329,7 +329,7 @@
|
||||
*/
|
||||
static void Callback(Stripchart* StripchartPtr);
|
||||
-static void ComputeStripchartGeometry(Stripchart* StripchartPtr);
|
||||
+static void ComputeStripchartGeometry(const Stripchart* StripchartPtr);
|
||||
static int ConfigureStripchart(Tcl_Interp* interp, Stripchart* StripchartPtr,
|
||||
- int argc, char** argv, int flags);
|
||||
+ int argc, const char** argv, int flags);
|
||||
static void DestroyStripchart(char* clientData);
|
||||
static void DisplayStripchart(ClientData clientData);
|
||||
@@ -337,9 +337,9 @@
|
||||
static void EventuallyRedrawStripchart(Stripchart* StripchartPtr,
|
||||
int displaybits);
|
||||
-static void ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv);
|
||||
+static void ReplaceColours(Stripchart* StripchartPtr, int argc, const char** argv);
|
||||
static void ScrollStrips(Stripchart* StripchartPtr);
|
||||
static void StripchartEventProc(ClientData clientData, XEvent* eventPtr);
|
||||
static int StripchartWidgetCmd(ClientData clientData, Tcl_Interp* interp,
|
||||
- int argc, char** argv);
|
||||
+ int argc, const char** argv);
|
||||
static void SetStripchartValue(Stripchart* StripchartPtr, double value);
|
||||
static void SwapColours(Stripchart* StripchartPtr);
|
||||
@@ -364,5 +364,5 @@
|
||||
int
|
||||
Tk_StripchartCmd(ClientData clientData, Tcl_Interp *interp, int argc,
|
||||
- char **argv)
|
||||
+ CONST char **argv)
|
||||
+ const char **argv)
|
||||
{
|
||||
Tk_Window tkwin = (Tk_Window) clientData;
|
||||
--- main.cpp Tue Feb 25 12:55:08 2003
|
||||
+++ main.cpp Thu Sep 23 18:51:59 2004
|
||||
@@ -407,5 +407,5 @@
|
||||
}
|
||||
|
||||
-extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av);
|
||||
+extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av);
|
||||
#ifdef WIN32
|
||||
extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av);
|
||||
@@ -419,5 +419,5 @@
|
||||
static int
|
||||
StripchartWidgetCmd(ClientData clientData, Tcl_Interp *interp,
|
||||
- int argc, char **argv)
|
||||
+ int argc, const char **argv)
|
||||
{
|
||||
register Stripchart *StripchartPtr = (Stripchart*)clientData;
|
||||
@@ -629,5 +629,5 @@
|
||||
static int
|
||||
ConfigureStripchart(Tcl_Interp *interp, Stripchart *StripchartPtr,
|
||||
- int argc, char** argv, int flags)
|
||||
+ int argc, const char** argv, int flags)
|
||||
{
|
||||
XGCValues gcValues;
|
||||
@@ -699,5 +699,5 @@
|
||||
*/
|
||||
static void
|
||||
-ComputeStripchartGeometry(Stripchart* StripchartPtr)
|
||||
+ComputeStripchartGeometry(const Stripchart* StripchartPtr)
|
||||
{
|
||||
int tt = hasatitle(StripchartPtr);
|
||||
@@ -1040,5 +1040,5 @@
|
||||
*/
|
||||
static void
|
||||
-ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv)
|
||||
+ReplaceColours(Stripchart* StripchartPtr, int argc, const char** argv)
|
||||
{
|
||||
StripchartPtr->altborder =
|
||||
--- vic_tcl.h Thu Sep 9 08:05:49 1999
|
||||
+++ vic_tcl.h Thu Sep 23 19:00:33 2004
|
||||
@@ -74,6 +77,6 @@
|
||||
|
|
16
mbone/vic/files/patch-defs
Normal file
16
mbone/vic/files/patch-defs
Normal file
|
@ -0,0 +1,16 @@
|
|||
--- codec/h263/Motion.h Thu Sep 9 08:45:55 1999
|
||||
+++ codec/h263/Motion.h Tue Mar 22 14:04:18 2005
|
||||
@@ -42,4 +42,5 @@
|
||||
} MVector;
|
||||
/***********************************************************CommentEnd********/
|
||||
+MVector *AllocMVector(void);
|
||||
|
||||
#endif /* _MOTION_STRUCTS_H_ */
|
||||
--- codec/h263/code.h Thu Sep 9 08:45:58 1999
|
||||
+++ codec/h263/code.h Tue Mar 22 14:06:24 2005
|
||||
@@ -167,4 +167,4 @@
|
||||
/***********************************************************CommentEnd********/
|
||||
|
||||
-
|
||||
+Code *InitCode(char *title, int size, int eventDim, int *event, char *cw[]);
|
||||
#endif /* _CODE_H */
|
53
mbone/vic/files/patch-main
Normal file
53
mbone/vic/files/patch-main
Normal file
|
@ -0,0 +1,53 @@
|
|||
--- main.cpp Tue Feb 25 12:55:08 2003
|
||||
+++ main.cpp Tue Mar 22 12:37:51 2005
|
||||
@@ -363,36 +363,4 @@
|
||||
#endif
|
||||
|
||||
-/*
|
||||
- * From the RTP spec.
|
||||
- */
|
||||
-u_int32_t
|
||||
-heuristic_random()
|
||||
-{
|
||||
- struct {
|
||||
- struct timeval tv;
|
||||
- clock_t cpu;
|
||||
- pid_t pid;
|
||||
- u_long hid;
|
||||
- uid_t uid;
|
||||
- gid_t gid;
|
||||
- struct utsname name;
|
||||
- } s;
|
||||
-
|
||||
- gettimeofday(&s.tv, 0);
|
||||
- uname(&s.name);
|
||||
- s.cpu = clock();
|
||||
- s.pid = getpid();
|
||||
- s.hid = gethostid();
|
||||
- s.uid = getuid();
|
||||
- s.gid = getgid();
|
||||
-
|
||||
- MD5_CTX context;
|
||||
- MD5Init(&context);
|
||||
- MD5Update(&context, (u_char*)&s, sizeof(s));
|
||||
- u_int32_t out[4];
|
||||
- MD5Final((u_char *)out, &context);
|
||||
- return (out[0] ^ out[1] ^ out[2] ^ out[3]);
|
||||
-}
|
||||
-
|
||||
void loadbitmaps(Tcl_Interp* tcl)
|
||||
{
|
||||
@@ -407,5 +375,5 @@
|
||||
}
|
||||
|
||||
-extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av);
|
||||
+extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av);
|
||||
#ifdef WIN32
|
||||
extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av);
|
||||
@@ -433,5 +401,5 @@
|
||||
main(int argc, const char** argv)
|
||||
{
|
||||
- srandom(heuristic_random());
|
||||
+ srandomdev();
|
||||
|
||||
#ifdef SIGHUP
|
21
mbone/vic/files/patch-md5
Normal file
21
mbone/vic/files/patch-md5
Normal file
|
@ -0,0 +1,21 @@
|
|||
--- net/crypt.cpp Thu Sep 9 08:48:51 1999
|
||||
+++ net/crypt.cpp Tue Mar 22 13:08:25 2005
|
||||
@@ -42,5 +42,5 @@
|
||||
#define PROTOTYPES 1
|
||||
#include "global.h"
|
||||
-#include "md5.h"
|
||||
+#include <openssl/md5.h>
|
||||
|
||||
Crypt::Crypt() : badpktlen_(0), badpbit_(0)
|
||||
@@ -70,8 +70,8 @@
|
||||
{
|
||||
MD5_CTX context;
|
||||
- MD5Init(&context);
|
||||
- MD5Update(&context, (u_char*)key, strlen(key));
|
||||
+ MD5_Init(&context);
|
||||
+ MD5_Update(&context, (u_char*)key, strlen(key));
|
||||
u_char hash[16];
|
||||
- MD5Final((u_char *)hash, &context);
|
||||
+ MD5_Final((u_char *)hash, &context);
|
||||
return (install_key(hash));
|
||||
}
|
|
@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-2.8ucl1.1.6
|
|||
MAINTAINER= mi@aldan.algebra.com
|
||||
COMMENT= MBONE video tool
|
||||
|
||||
LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
|
||||
LIB_DEPENDS= tk84:${PORTSDIR}/x11-toolkits/tk84 \
|
||||
uclmmbase:${PORTSDIR}/devel/uclmmbase
|
||||
|
||||
USE_AUTOCONF_VER= 213
|
||||
|
@ -28,6 +28,9 @@ CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \
|
|||
-enable-ipv6
|
||||
MAN1= vic.1
|
||||
|
||||
post-patch:
|
||||
${RM} ${WRKSRC}/md5*
|
||||
|
||||
post-install:
|
||||
${STRIP_CMD} ${PREFIX}/bin/vic
|
||||
${STRIP_CMD} ${PREFIX}/bin/histtolut
|
||||
|
|
|
@ -1,20 +1,17 @@
|
|||
--- Makefile.in Wed Apr 30 07:50:17 2003
|
||||
+++ Makefile.in Thu Sep 23 18:42:54 2004
|
||||
@@ -58,7 +58,7 @@
|
||||
INCLUDE_TK = @V_INCLUDE_TK@
|
||||
+++ Makefile.in Tue Mar 22 13:18:58 2005
|
||||
@@ -59,5 +59,5 @@
|
||||
INCLUDE_TCL = @V_INCLUDE_TCL@
|
||||
INCLUDE_X11 = @V_INCLUDE_X11@
|
||||
-INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src
|
||||
+INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I@prefix@/include/uclmmbase
|
||||
+INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I${LOCALBASE}/include/uclmmbase
|
||||
|
||||
STATIC = @V_STATIC@
|
||||
MKDEP = ./mkdep
|
||||
@@ -89,12 +89,12 @@
|
||||
OBJ_XIL = @V_OBJ_XIL@
|
||||
@@ -90,10 +90,10 @@
|
||||
OBJ_CRYPT = @V_OBJ_CRYPT@
|
||||
LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_X11@ @V_LIB@ \
|
||||
- codec/tmndec/libh263.a codec/tmn-x/libh263coder.a ../common/src/libuclmmbase.a -lm
|
||||
+ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a -L@prefix@/lib -luclmmbase -lm
|
||||
+ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a -L${LOCALBASE}/lib -luclmmbase -lm
|
||||
INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \
|
||||
$(INCLUDE_X11) $(MD_INC) -Icodec/jpeg -Icodec/p64 -I.
|
||||
DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8
|
||||
|
@ -23,18 +20,31 @@
|
|||
+CFLAGS += $(BFLAGS)
|
||||
|
||||
#
|
||||
# Remember to add a dependency if you add any tcl sources here.
|
||||
@@ -333,7 +333,7 @@
|
||||
chown bin @prefix@/bin/vic
|
||||
chgrp bin @prefix@/bin/vic
|
||||
chmod 555 @prefix@/bin/vic
|
||||
- cp vic.1 @prefix@/man/vic.1
|
||||
+ cp vic.1 @prefix@/man/man1/vic.1
|
||||
cp histtolut @prefix@/bin/histtolut
|
||||
chown bin @prefix@/bin/histtolut
|
||||
chgrp bin @prefix@/bin/histtolut
|
||||
@@ -410,7 +410,7 @@
|
||||
@@ -123,5 +123,5 @@
|
||||
|
||||
# .c objects
|
||||
-OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o md5c.o random.o \
|
||||
+OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o \
|
||||
$(H263_OBJS)
|
||||
# session-rtpv1.o session-nv.o session-ivs.o # Not supported anymore
|
||||
@@ -330,13 +330,7 @@
|
||||
|
||||
install: force
|
||||
- cp vic @prefix@/bin/vic
|
||||
- chown bin @prefix@/bin/vic
|
||||
- chgrp bin @prefix@/bin/vic
|
||||
- chmod 555 @prefix@/bin/vic
|
||||
- cp vic.1 @prefix@/man/vic.1
|
||||
- cp histtolut @prefix@/bin/histtolut
|
||||
- chown bin @prefix@/bin/histtolut
|
||||
- chgrp bin @prefix@/bin/histtolut
|
||||
- chmod 555 @prefix@/bin/histtolut
|
||||
+ ${BSD_INSTALL_PROGRAM} vic @prefix@/bin/vic
|
||||
+ ${BSD_INSTALL_MAN} vic.1 @prefix@/man/man1/vic.1
|
||||
+ ${BSD_INSTALL_PROGRAM} histtolut @prefix@/bin/histtolut
|
||||
|
||||
clean:
|
||||
@@ -411,6 +405,6 @@
|
||||
|
||||
codec/tmn-x/libh263coder.a:
|
||||
- (cd codec/tmn-x; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" )
|
||||
|
|
|
@ -1,21 +1,62 @@
|
|||
--- tkStripchart.c Mon Jun 29 15:17:00 1998
|
||||
+++ tkStripchart.c Thu Sep 23 18:50:39 2004
|
||||
--- tkStripchart.c.orig Mon Jun 29 15:17:00 1998
|
||||
+++ tkStripchart.c Tue Mar 22 13:02:03 2005
|
||||
@@ -329,7 +329,7 @@
|
||||
*/
|
||||
static void Callback(Stripchart* StripchartPtr);
|
||||
-static void ComputeStripchartGeometry(Stripchart* StripchartPtr);
|
||||
+static void ComputeStripchartGeometry(const Stripchart* StripchartPtr);
|
||||
static int ConfigureStripchart(Tcl_Interp* interp, Stripchart* StripchartPtr,
|
||||
- int argc, char** argv, int flags);
|
||||
+ int argc, const char** argv, int flags);
|
||||
static void DestroyStripchart(char* clientData);
|
||||
static void DisplayStripchart(ClientData clientData);
|
||||
@@ -337,9 +337,9 @@
|
||||
static void EventuallyRedrawStripchart(Stripchart* StripchartPtr,
|
||||
int displaybits);
|
||||
-static void ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv);
|
||||
+static void ReplaceColours(Stripchart* StripchartPtr, int argc, const char** argv);
|
||||
static void ScrollStrips(Stripchart* StripchartPtr);
|
||||
static void StripchartEventProc(ClientData clientData, XEvent* eventPtr);
|
||||
static int StripchartWidgetCmd(ClientData clientData, Tcl_Interp* interp,
|
||||
- int argc, char** argv);
|
||||
+ int argc, const char** argv);
|
||||
static void SetStripchartValue(Stripchart* StripchartPtr, double value);
|
||||
static void SwapColours(Stripchart* StripchartPtr);
|
||||
@@ -364,5 +364,5 @@
|
||||
int
|
||||
Tk_StripchartCmd(ClientData clientData, Tcl_Interp *interp, int argc,
|
||||
- char **argv)
|
||||
+ CONST char **argv)
|
||||
+ const char **argv)
|
||||
{
|
||||
Tk_Window tkwin = (Tk_Window) clientData;
|
||||
--- main.cpp Tue Feb 25 12:55:08 2003
|
||||
+++ main.cpp Thu Sep 23 18:51:59 2004
|
||||
@@ -407,5 +407,5 @@
|
||||
}
|
||||
|
||||
-extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av);
|
||||
+extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av);
|
||||
#ifdef WIN32
|
||||
extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av);
|
||||
@@ -419,5 +419,5 @@
|
||||
static int
|
||||
StripchartWidgetCmd(ClientData clientData, Tcl_Interp *interp,
|
||||
- int argc, char **argv)
|
||||
+ int argc, const char **argv)
|
||||
{
|
||||
register Stripchart *StripchartPtr = (Stripchart*)clientData;
|
||||
@@ -629,5 +629,5 @@
|
||||
static int
|
||||
ConfigureStripchart(Tcl_Interp *interp, Stripchart *StripchartPtr,
|
||||
- int argc, char** argv, int flags)
|
||||
+ int argc, const char** argv, int flags)
|
||||
{
|
||||
XGCValues gcValues;
|
||||
@@ -699,5 +699,5 @@
|
||||
*/
|
||||
static void
|
||||
-ComputeStripchartGeometry(Stripchart* StripchartPtr)
|
||||
+ComputeStripchartGeometry(const Stripchart* StripchartPtr)
|
||||
{
|
||||
int tt = hasatitle(StripchartPtr);
|
||||
@@ -1040,5 +1040,5 @@
|
||||
*/
|
||||
static void
|
||||
-ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv)
|
||||
+ReplaceColours(Stripchart* StripchartPtr, int argc, const char** argv)
|
||||
{
|
||||
StripchartPtr->altborder =
|
||||
--- vic_tcl.h Thu Sep 9 08:05:49 1999
|
||||
+++ vic_tcl.h Thu Sep 23 19:00:33 2004
|
||||
@@ -74,6 +77,6 @@
|
||||
|
|
16
multimedia/vic/files/patch-defs
Normal file
16
multimedia/vic/files/patch-defs
Normal file
|
@ -0,0 +1,16 @@
|
|||
--- codec/h263/Motion.h Thu Sep 9 08:45:55 1999
|
||||
+++ codec/h263/Motion.h Tue Mar 22 14:04:18 2005
|
||||
@@ -42,4 +42,5 @@
|
||||
} MVector;
|
||||
/***********************************************************CommentEnd********/
|
||||
+MVector *AllocMVector(void);
|
||||
|
||||
#endif /* _MOTION_STRUCTS_H_ */
|
||||
--- codec/h263/code.h Thu Sep 9 08:45:58 1999
|
||||
+++ codec/h263/code.h Tue Mar 22 14:06:24 2005
|
||||
@@ -167,4 +167,4 @@
|
||||
/***********************************************************CommentEnd********/
|
||||
|
||||
-
|
||||
+Code *InitCode(char *title, int size, int eventDim, int *event, char *cw[]);
|
||||
#endif /* _CODE_H */
|
53
multimedia/vic/files/patch-main
Normal file
53
multimedia/vic/files/patch-main
Normal file
|
@ -0,0 +1,53 @@
|
|||
--- main.cpp Tue Feb 25 12:55:08 2003
|
||||
+++ main.cpp Tue Mar 22 12:37:51 2005
|
||||
@@ -363,36 +363,4 @@
|
||||
#endif
|
||||
|
||||
-/*
|
||||
- * From the RTP spec.
|
||||
- */
|
||||
-u_int32_t
|
||||
-heuristic_random()
|
||||
-{
|
||||
- struct {
|
||||
- struct timeval tv;
|
||||
- clock_t cpu;
|
||||
- pid_t pid;
|
||||
- u_long hid;
|
||||
- uid_t uid;
|
||||
- gid_t gid;
|
||||
- struct utsname name;
|
||||
- } s;
|
||||
-
|
||||
- gettimeofday(&s.tv, 0);
|
||||
- uname(&s.name);
|
||||
- s.cpu = clock();
|
||||
- s.pid = getpid();
|
||||
- s.hid = gethostid();
|
||||
- s.uid = getuid();
|
||||
- s.gid = getgid();
|
||||
-
|
||||
- MD5_CTX context;
|
||||
- MD5Init(&context);
|
||||
- MD5Update(&context, (u_char*)&s, sizeof(s));
|
||||
- u_int32_t out[4];
|
||||
- MD5Final((u_char *)out, &context);
|
||||
- return (out[0] ^ out[1] ^ out[2] ^ out[3]);
|
||||
-}
|
||||
-
|
||||
void loadbitmaps(Tcl_Interp* tcl)
|
||||
{
|
||||
@@ -407,5 +375,5 @@
|
||||
}
|
||||
|
||||
-extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av);
|
||||
+extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av);
|
||||
#ifdef WIN32
|
||||
extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av);
|
||||
@@ -433,5 +401,5 @@
|
||||
main(int argc, const char** argv)
|
||||
{
|
||||
- srandom(heuristic_random());
|
||||
+ srandomdev();
|
||||
|
||||
#ifdef SIGHUP
|
21
multimedia/vic/files/patch-md5
Normal file
21
multimedia/vic/files/patch-md5
Normal file
|
@ -0,0 +1,21 @@
|
|||
--- net/crypt.cpp Thu Sep 9 08:48:51 1999
|
||||
+++ net/crypt.cpp Tue Mar 22 13:08:25 2005
|
||||
@@ -42,5 +42,5 @@
|
||||
#define PROTOTYPES 1
|
||||
#include "global.h"
|
||||
-#include "md5.h"
|
||||
+#include <openssl/md5.h>
|
||||
|
||||
Crypt::Crypt() : badpktlen_(0), badpbit_(0)
|
||||
@@ -70,8 +70,8 @@
|
||||
{
|
||||
MD5_CTX context;
|
||||
- MD5Init(&context);
|
||||
- MD5Update(&context, (u_char*)key, strlen(key));
|
||||
+ MD5_Init(&context);
|
||||
+ MD5_Update(&context, (u_char*)key, strlen(key));
|
||||
u_char hash[16];
|
||||
- MD5Final((u_char *)hash, &context);
|
||||
+ MD5_Final((u_char *)hash, &context);
|
||||
return (install_key(hash));
|
||||
}
|
Loading…
Add table
Reference in a new issue