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

- Regen patches.

Browse Source 
- Honor CC, CFLAGS.
- Make this compile with gcc3.
This commit is contained in:
naddy 2002-10-06 22:28:49 +00:00
parent a1df5b0207
commit 9759e5be25
20 changed files with 120 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mbone/vic/Makefile
View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2001/06/20 01:43:27 pvalchev Exp $
# $OpenBSD: Makefile,v 1.24 2002/10/06 22:28:49 naddy Exp $
COMMENT= "MBONE video tool"
DISTNAME= vic-2.8ucl4
CATEGORIES= mbone
NEED_VERSION= 1.402
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl4/
MAINTAINER= Angelos D. Keromytis <angelos@openbsd.org>
@ -15,13 +13,16 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl4/
LIB_DEPENDS= tcl80.1.5::lang/tcl/8.0 \
tk80.1.5::x11/tk/8.0
USE_X11= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= autoconf
MAKE_ENV= CC="${CC}" CCOPT="${CFLAGS}"
WRKDIST= ${WRKDIR}/vic
WRKDIST= ${WRKDIR}/vic
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/vic ${PREFIX}/bin

12
mbone/vic/patches/patch-aa
View File

@ -1,12 +0,0 @@
--- config.guess.orig Wed Feb 18 13:03:20 1998
+++ config.guess Tue Nov 30 16:56:44 1999
@@ -284,6 +284,9 @@
i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
*:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;

12
mbone/vic/patches/patch-ad
View File

@ -1,12 +0,0 @@
--- configure.in.orig Sat Sep 4 20:16:05 1999
+++ configure.in Sat Sep 4 20:18:29 1999
@@ -230,6 +230,9 @@
V_TARCMD="tar -h -c -f"
V_LIB="$V_LIB -L/usr/local/lib"
;;
+*-*-openbsd*)
+
+ ;;
*-*-freebsd*)
;;

11
mbone/vic/patches/patch-ae
View File

@ -1,11 +0,0 @@
--- config.sub.orig Sat Sep 4 20:26:51 1999
+++ config.sub Sat Sep 4 20:27:15 1999
@@ -609,7 +609,7 @@
| -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
| -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
| -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
+ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta | -udi | -eabi)
;;

14
mbone/vic/patches/patch-aj
View File

@ -1,14 +0,0 @@
--- qfDES_memory.c.orig Sat Oct 30 17:37:17 1999
+++ qfDES_memory.c Sat Oct 30 17:37:31 1999
@@ -8,7 +8,11 @@
#include <stdio.h>
#include <memory.h>
+
+#ifndef __OpenBSD__
#include <malloc.h>
+#endif
+
#include <ctype.h>
#include "config.h"
#include "qfDES.h"

7
mbone/vic/patches/patch-ak → mbone/vic/patches/patch-config_h
View File

@ -1,5 +1,6 @@
--- config.h.orig Mon Mar 22 09:44:40 1999
+++ config.h Tue Nov 30 16:56:44 1999
$OpenBSD: patch-config_h,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- config.h.orig Mon Mar 22 15:44:40 1999
+++ config.h Sun Oct 6 23:05:29 2002
@@ -36,7 +36,7 @@
#ifndef vic_config_h
#define vic_config_h
@ -9,7 +10,7 @@
# include <sys/types.h>
#elif defined(sun)
#include <sys/types.h>
@@ -94,7 +94,7 @@
@@ -94,7 +94,7 @@ extern "C" {
#include <arpa/inet.h>
int strcasecmp(const char *, const char *);
clock_t clock(void);

13
mbone/vic/patches/patch-configure_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-configure_in,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- configure.in.orig Fri Jun 4 13:39:32 1999
+++ configure.in Sun Oct 6 23:07:08 2002
@@ -230,6 +230,9 @@ sparc-sun-sunos*)
V_TARCMD="tar -h -c -f"
V_LIB="$V_LIB -L/usr/local/lib"
;;
+*-*-openbsd*)
+ V_DEFINE="$V_DEFINE -DSIGARGS=int"
+ ;;
*-*-freebsd*)
;;

19
mbone/vic/patches/patch-al → mbone/vic/patches/patch-configure_in_tk
View File

@ -1,6 +1,7 @@
--- configure.in.tk.orig Fri Apr 23 10:42:57 1999
+++ configure.in.tk Tue Nov 30 16:56:44 1999
@@ -22,8 +22,8 @@
$OpenBSD: patch-configure_in_tk,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- configure.in.tk.orig Fri Apr 23 16:42:57 1999
+++ configure.in.tk Sun Oct 6 23:05:29 2002
@@ -22,8 +22,8 @@ if test "$d" != "" ; then
echo "can't find tcl.h in $d/include"
exit 1
fi
@ -11,7 +12,7 @@
$d/lib/libtcl.so \
$d/lib/libtcl.a"
V_LIB_TCL=FAIL
@@ -78,7 +78,7 @@
@@ -78,7 +78,7 @@ else
exit 1
fi
fi
@ -20,7 +21,7 @@
if test "$V_LIB_TCL" = FAIL; then
echo "checking for libtcl.a"
places="$PWD/../tcl8.0/unix \
@@ -96,8 +96,8 @@
@@ -96,8 +96,8 @@ else
/import/tcl/lib/tcl8.0 \
"
for dir in $places; do
@ -31,7 +32,7 @@
break
fi
if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
@@ -160,8 +160,8 @@
@@ -160,8 +160,8 @@ if test "$d" != "" ; then
echo "can't find tk.h in $d/include"
exit 1
fi
@ -42,7 +43,7 @@
$d/lib/libtk.so \
$d/lib/libtk.a"
V_LIB_TK=FAIL
@@ -197,6 +197,7 @@
@@ -197,6 +197,7 @@ else
$PWD/../tk-8.0/generic \
$PWD/../tk/generic \
/cs/research/mice/starship/common/$OPSYS/include \
@ -50,7 +51,7 @@
/usr/local/include \
$prefix/include \
/usr/contrib/include \
@@ -219,7 +220,7 @@
@@ -219,7 +220,7 @@ else
exit 1
fi
fi
@ -59,7 +60,7 @@
if test "$V_LIB_TK" = FAIL; then
echo "checking for libtk.a"
places="$PWD/../tk8.0/unix \
@@ -236,8 +237,8 @@
@@ -236,8 +237,8 @@ else
$prefix/lib \
$x_libraries"
for dir in $places; do

17
mbone/vic/patches/patch-encoder-jpeg_cc Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-encoder-jpeg_cc,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- encoder-jpeg.cc.orig Mon Oct 7 00:19:26 2002
+++ encoder-jpeg.cc Mon Oct 7 00:19:35 2002
@@ -126,12 +126,12 @@ class JpegEncoder : public TransmitterMo
void size(int w, int h);
int consume(const VideoFrame*);
- protected:
struct huffentry {
u_short val;
u_short nb;
};
+ protected:
int command(int argc, const char*const* argv);
int flush(Transmitter::pktbuf* pb, int nbit, Transmitter::pktbuf* npb);

9
mbone/vic/patches/patch-ao → mbone/vic/patches/patch-grabber-meteor_cc
View File

@ -1,6 +1,7 @@
--- grabber-meteor.cc.orig Sun Jan 16 01:07:20 2000
+++ grabber-meteor.cc Sun Jan 16 01:15:39 2000
@@ -192,7 +192,7 @@
$OpenBSD: patch-grabber-meteor_cc,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- grabber-meteor.cc.orig Thu Jan 14 13:48:41 1999
+++ grabber-meteor.cc Sun Oct 6 23:05:29 2002
@@ -192,7 +192,7 @@ int MeteorDevice::command(int argc, cons
return (InputDevice::command(argc, argv));
}
@ -9,7 +10,7 @@
{
count = 0;
@@ -415,6 +415,7 @@
@@ -415,6 +415,7 @@ int MeteorGrabber::command(int argc, con
u_char val = atoi(argv[2]);
ioctl(dev_, METEORSCHCV, &val);
return (TCL_OK);

13
mbone/vic/patches/patch-ac → mbone/vic/patches/patch-grabber-x11_cc
View File

@ -1,5 +1,6 @@
--- grabber-x11.cc.orig Fri Jun 11 06:34:19 1999
+++ grabber-x11.cc Sat Oct 30 17:41:17 1999
$OpenBSD: patch-grabber-x11_cc,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- grabber-x11.cc.orig Fri Jun 11 12:34:19 1999
+++ grabber-x11.cc Sun Oct 6 23:05:29 2002
@@ -46,6 +46,11 @@
#include <X11/Xutil.h>
#include <X11/Xatom.h>
@ -12,7 +13,7 @@
#include <tk.h>
/*** #include "sized_types.h" ***/
@@ -194,12 +199,9 @@
@@ -194,12 +199,9 @@ static X11Device find_x11_devices("x11")
X11Device::X11Device(const char* nickname):
InputDevice(nickname), name_(nickname)
{
@ -26,7 +27,7 @@
}
extern "C" {
@@ -454,7 +456,9 @@
@@ -454,7 +456,9 @@ X11Grabber::X11Grab_RGB16(void)
uint8 *vp= up + (framesize_ >> 2) ;
uint16 *data=(uint16 *)ximage_->image->data, p0, p1, p2, p3;
@ -36,7 +37,7 @@
for (y=0; y<height_; y+=2) {
for (x=0; x<width_; x += 2) {
@@ -693,7 +697,7 @@
@@ -693,7 +697,7 @@ X11Grabber::X11Grab_Initialize(Window rw
VidUtil_DestroyXImage(dpy_, ximage_);
ximage_ = VidUtil_AllocXImage(dpy_, root_vis, root_depth_, w, h, False);
}
@ -45,7 +46,7 @@
}
extern "C" {
@@ -1049,7 +1053,7 @@
@@ -1049,7 +1053,7 @@ X11Device::command(int argc, const char*
X11Grabber::X11Grabber(const char* name, const char* format)
{

5
mbone/vic/patches/patch-ag → mbone/vic/patches/patch-h263_Util_h
View File

@ -1,5 +1,6 @@
--- h263/Util.h.orig Sat Oct 30 17:24:44 1999
+++ h263/Util.h Sat Oct 30 17:44:05 1999
$OpenBSD: patch-h263_Util_h,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- h263/Util.h.orig Fri Nov 20 19:11:30 1998
+++ h263/Util.h Sun Oct 6 23:05:29 2002
@@ -6,7 +6,10 @@
#ifndef _UTIL_
#define _UTIL_

5
mbone/vic/patches/patch-af → mbone/vic/patches/patch-h263_defs_h
View File

@ -1,5 +1,6 @@
--- h263/defs.h.orig Sat Oct 30 17:23:58 1999
+++ h263/defs.h Sat Oct 30 17:24:10 1999
$OpenBSD: patch-h263_defs_h,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- h263/defs.h.orig Thu Jun 3 17:53:34 1999
+++ h263/defs.h Sun Oct 6 23:05:29 2002
@@ -8,8 +8,10 @@
#define NUM_LAYERS 4

9
mbone/vic/patches/patch-an → mbone/vic/patches/patch-net-ip_cc
View File

@ -1,6 +1,7 @@
--- net-ip.cc.orig Sun Jan 16 01:03:33 2000
+++ net-ip.cc Sun Jan 16 01:04:37 2000
@@ -246,7 +246,7 @@
$OpenBSD: patch-net-ip_cc,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- net-ip.cc.orig Tue Feb 16 15:01:42 1999
+++ net-ip.cc Sun Oct 6 23:05:29 2002
@@ -246,7 +246,7 @@ int IPNetwork::localname(sockaddr_in* p)
{
memset((char *)p, 0, sizeof(*p));
p->sin_family = AF_INET;
@ -9,7 +10,7 @@
if ((result = getsockname(ssock_, (struct sockaddr *)p, &len)) < 0) {
perror("getsockname");
@@ -469,7 +469,7 @@
@@ -469,7 +469,7 @@ you must specify a unicast destination\n
int IPNetwork::dorecv(u_char* buf, int len, Address & from, int fd)
{
sockaddr_in sfrom;

7
mbone/vic/patches/patch-am → mbone/vic/patches/patch-net_cc
View File

@ -1,6 +1,7 @@
--- net.cc.orig Sun Jan 16 01:02:31 2000
+++ net.cc Sun Jan 16 01:02:50 2000
@@ -344,7 +344,7 @@
$OpenBSD: patch-net_cc,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- net.cc.orig Mon Mar 29 19:16:32 1999
+++ net.cc Sun Oct 6 23:05:29 2002
@@ -344,7 +344,7 @@ void Network::send(const msghdr& mh)
int Network::dorecv(u_char* buf, int len, u_int32_t& from, int fd)
{
sockaddr_in sfrom;

7
mbone/vic/patches/patch-ah → mbone/vic/patches/patch-ntp-time_h
View File

@ -1,6 +1,7 @@
--- ntp-time.h.orig Sat Oct 30 17:27:06 1999
+++ ntp-time.h Sat Oct 30 17:30:38 1999
@@ -55,7 +55,7 @@
$OpenBSD: patch-ntp-time_h,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- ntp-time.h.orig Wed Feb 18 19:03:39 1998
+++ ntp-time.h Sun Oct 6 23:05:29 2002
@@ -55,7 +55,7 @@ inline u_int usec2ntp(u_int usec)
/*
* Number of seconds between 1-Jan-1900 and 1-Jan-1970
*/

13
mbone/vic/patches/patch-ai → mbone/vic/patches/patch-qfDES_c
View File

@ -1,6 +1,7 @@
--- qfDES.c.orig Sat Oct 30 17:36:06 1999
+++ qfDES.c Sat Oct 30 17:36:37 1999
@@ -128,7 +128,7 @@
$OpenBSD: patch-qfDES_c,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- qfDES.c.orig Mon Mar 29 19:16:33 1999
+++ qfDES.c Sun Oct 6 23:05:29 2002
@@ -128,7 +128,7 @@ v = ((v & rot[0]) << rot[1]) | v >> rot[
}
@ -9,7 +10,7 @@
{ \
register unsigned int z, l = s/4; \
register Word *tp = (Word *) t; \
@@ -204,8 +204,8 @@
@@ -204,8 +204,8 @@ char *initVec;
#if defined(__i386__)
unsigned int origSize = size;
@ -20,7 +21,7 @@
#endif
/*
@@ -258,7 +258,7 @@
@@ -258,7 +258,7 @@ char *initVec;
cb[0] = cb[1] = 0;
#if defined(__i386__)
@ -29,7 +30,7 @@
#endif
}
@@ -401,15 +401,15 @@
@@ -401,15 +401,15 @@ _initVec_:
((Word *) initVec)[1] = cb[1];
#if defined(__i386__)

15
mbone/vic/patches/patch-qfDES_memory_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-qfDES_memory_c,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- qfDES_memory.c.orig Thu Apr 8 13:07:26 1999
+++ qfDES_memory.c Sun Oct 6 23:05:29 2002
@@ -8,7 +8,11 @@ February 1993
#include <stdio.h>
#include <memory.h>
+
+#ifndef __OpenBSD__
#include <malloc.h>
+#endif
+
#include <ctype.h>
#include "config.h"
#include "qfDES.h"

14
mbone/vic/patches/patch-tmn_Makefile Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-tmn_Makefile,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- tmn/Makefile.orig Sun Oct 6 23:38:26 2002
+++ tmn/Makefile Sun Oct 6 23:38:36 2002
@@ -23,8 +23,8 @@ OBJS = main.o io.o dct.o coder.o quant.o
# The defines above can also be defined in sim.h
-CC = gcc
-CFLAGS = -g -O3
+#CC = gcc
+#CFLAGS = -g -O3
#CFLAGS = -g -Wall -ansi -pedantic
# If you want to compile with -Wall -pedantic -ansi on a Sun, use

5
mbone/vic/patches/patch-ab → mbone/vic/patches/patch-ui-grabber_tcl
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-ui-grabber_tcl,v 1.1 2002/10/06 22:28:49 naddy Exp $
--- ui-grabber.tcl.orig Wed Jun 9 13:29:24 1999
+++ ui-grabber.tcl Wed Jul 28 14:42:30 1999
@@ -454,6 +454,8 @@
+++ ui-grabber.tcl Sun Oct 6 23:05:29 2002
@@ -454,6 +454,8 @@ proc build.slicvideo w {
# pack $w.f.cl.glabel $w.f.cl.label $w.f.cl.slabel \
# -side left -fill x -expand 1