From ed743a35af974d72cceff2796f0ea4d8dd6d8883 Mon Sep 17 00:00:00 2001 From: rillig Date: Mon, 8 Jan 2007 04:51:44 +0000 Subject: Updated cqcam to 0.91. 0.91 * Code reorganization * New GTK+ interface * Yet another overhaul of the XImage code, with some optimizations * Improved some documentation * Changed license to the GPL (and LGPL) * Major security fixes * Assorted bug fixes * Netwinder (ARM) port * Locking rewrite [Bruce Momjian] * 25-50% speedup in core driver code [Joe Zbiciak] * Solaris version [Simon Thornington] * OpenBSD support [Matt Mosley] * GTK 1.1/1.2 support [David Raufeisen] * Movie mode * Bulb mode, for long exposures --- graphics/cqcam/Makefile | 28 ++------- graphics/cqcam/PLIST | 5 +- graphics/cqcam/distinfo | 21 +++---- graphics/cqcam/patches/patch-aa | 125 ---------------------------------------- graphics/cqcam/patches/patch-ab | 29 +++++----- graphics/cqcam/patches/patch-ac | 10 ++-- graphics/cqcam/patches/patch-ad | 15 ----- graphics/cqcam/patches/patch-ae | 12 ---- graphics/cqcam/patches/patch-af | 39 +++++++------ graphics/cqcam/patches/patch-ag | 12 ---- graphics/cqcam/patches/patch-ah | 9 --- graphics/cqcam/patches/patch-ai | 16 +++++ graphics/cqcam/patches/patch-aj | 18 ++++++ 13 files changed, 93 insertions(+), 246 deletions(-) delete mode 100644 graphics/cqcam/patches/patch-aa delete mode 100644 graphics/cqcam/patches/patch-ad delete mode 100644 graphics/cqcam/patches/patch-ae delete mode 100644 graphics/cqcam/patches/patch-ag delete mode 100644 graphics/cqcam/patches/patch-ah create mode 100644 graphics/cqcam/patches/patch-ai create mode 100644 graphics/cqcam/patches/patch-aj (limited to 'graphics/cqcam') diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index c3a63e6a00a..406871c0cfb 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -1,38 +1,22 @@ -# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:55 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2007/01/08 04:51:44 rillig Exp $ # -DISTNAME= cqcam-0.45a -PKGREVISION= 3 -CATEGORIES= graphics x11 +DISTNAME= cqcam-0.91 +CATEGORIES= graphics x11 MASTER_SITES= http://www.cs.duke.edu/~reynolds/cqcam/ -EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cs.duke.edu/~reynolds/cqcam/ COMMENT= Free Color QuickCam control program -ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-alpha +#NOT_FOR_UNPRIVILEGED= yes # seems to need setuid for everything -LICENSE= no-profit - -HAS_CONFIGURE= YES +GNU_CONFIGURE= yes USE_LANGUAGES= c c++ -CONFIGURE_ENV+= CAT=${CAT:Q} ECHO=${ECHO:Q} \ - TCLCONFIG_SH=${TCLCONFIG_SH:Q} +CONFIGURE_ENV+= TCLCONFIG_SH=${TCLCONFIG_SH:Q} .include "../../graphics/jpeg/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" - -post-patch: - ${CHMOD} a+x ${WRKSRC}/configure - ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.in - -post-install: - ${RM} ${PREFIX}/${PKGMANDIR}/man1/webcam.1.gz - ${RM} ${PREFIX}/${PKGMANDIR}/man1/xcqcam.1.gz - ${LN} ${PREFIX}/${PKGMANDIR}/man1/cqcam.1 ${PREFIX}/${PKGMANDIR}/man1/webcam.1 - ${LN} ${PREFIX}/${PKGMANDIR}/man1/cqcam.1 ${PREFIX}/${PKGMANDIR}/man1/xcqcam.1 - .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cqcam/PLIST b/graphics/cqcam/PLIST index 1a4b8123e52..826e0e6240e 100644 --- a/graphics/cqcam/PLIST +++ b/graphics/cqcam/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2004/07/10 22:18:23 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/01/08 04:51:44 rillig Exp $ bin/cqcam -bin/xcqcam +bin/movify bin/webcam +bin/xcqcam man/man1/cqcam.1 man/man1/webcam.1 man/man1/xcqcam.1 diff --git a/graphics/cqcam/distinfo b/graphics/cqcam/distinfo index 7212e28a882..80ba04494d4 100644 --- a/graphics/cqcam/distinfo +++ b/graphics/cqcam/distinfo @@ -1,13 +1,10 @@ -$NetBSD: distinfo,v 1.7 2005/02/24 08:45:04 agc Exp $ +$NetBSD: distinfo,v 1.8 2007/01/08 04:51:44 rillig Exp $ -SHA1 (cqcam-0.45a.tgz) = 39affec6ad3e81cc837ab583d01207767d4f7273 -RMD160 (cqcam-0.45a.tgz) = 5f0974b0f78c5168e8382d57f1567b63146e47d4 -Size (cqcam-0.45a.tgz) = 40163 bytes -SHA1 (patch-aa) = dc64d8f880ef5d9807f476ff4840c80bbe8508a2 -SHA1 (patch-ab) = a81c6bc06146065cf6cccd377276a3bc5a3b2686 -SHA1 (patch-ac) = 868cedbdb0e866013079408d2260eb5084121da7 -SHA1 (patch-ad) = 79c73e48ed2dbfdf13286afe1959e1d1fdcacb0d -SHA1 (patch-ae) = 3b07a7df2428f6275af449abded061bbed9f23db -SHA1 (patch-af) = 2f786a6c3aec812c1c446735756b46dbc70ebd15 -SHA1 (patch-ag) = a6446bb7c03ebd6525173fbb72dc011dda09ce30 -SHA1 (patch-ah) = f0b370ee03774e315861c1948d2e3b2723f385f8 +SHA1 (cqcam-0.91.tar.gz) = 28c78c9a24ae01b5a18d81e334f8c0dcab2ebe78 +RMD160 (cqcam-0.91.tar.gz) = 4ef62b01985f834063a0e0941391b8d06428af7e +Size (cqcam-0.91.tar.gz) = 121252 bytes +SHA1 (patch-ab) = 3fa3af81031ac4569e68416f2494c19bc5ce276d +SHA1 (patch-ac) = 1c2f0c62ee192864ca6e25caf966b51ea37ed466 +SHA1 (patch-af) = a282c32139c6bff100677bc8609f77971fb0295d +SHA1 (patch-ai) = e61408d8804553741c41a5756cd70ed3a7cb9453 +SHA1 (patch-aj) = 4a11c8bc807c11f3b68971eb44b325e10b32b070 diff --git a/graphics/cqcam/patches/patch-aa b/graphics/cqcam/patches/patch-aa deleted file mode 100644 index 955435d2b36..00000000000 --- a/graphics/cqcam/patches/patch-aa +++ /dev/null @@ -1,125 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2005/01/22 03:04:31 minskim Exp $ - ---- Makefile.orig 1997-10-28 00:07:06.000000000 +0100 -+++ Makefile -@@ -13,9 +13,9 @@ PROGRAMS = cqcam xcqcam webcam - # OS-specific stuff: uncomment all of the lines for your OS of choice - - # Linux (people with Alphas probably need to enable -DBROKEN_IO_H) --CFLAGS = -O2 --LDFLAGS = -s --DEFS += -DLINUX # -DBROKEN_IO_H -+#CFLAGS = -O2 -+#LDFLAGS = -s -+#DEFS += -DLINUX # -DBROKEN_IO_H - - # QNX - #CFLAGS = -O2 -T1 -@@ -23,10 +23,21 @@ DEFS += -DLINUX # -DBROKEN_IO_H - #DEFS += -DQNX - - # FreeBSD --#CFLAGS = -O2 -I/usr/X11R6/include -I/usr/local/include --#LDFLAGS = -L/usr/local/lib -L/usr/X11R6/lib -+#CFLAGS = -O2 -I${X11BASE}/include -I${PREFIX}/include -+#LDFLAGS = -L${PREFIX}/lib -L${X11BASE}/lib - #DEFS += -DFREEBSD - -+# NetBSD -+CFLAGS+= -I${X11BASE}/include -+LDFLAGS+= -L${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -+DEFS += -DNETBSD -+# XXX -+.if (${MACHINE_ARCH} == "alpha") -+LDLIBS += -lalpha -+.elif (${MACHINE_ARCH} == "i386") -+LDLIBS += -li386 -+.endif -+ - # BSDI 3.0 - #CFLAGS = -O2 -I/usr/X11R6/include -I/usr/local/include - #LDFLAGS = -L/usr/local/lib -L/usr/X11R6/lib -@@ -44,15 +55,14 @@ DEFS += -DLINUX # -DBROKEN_IO_H - # JPEG stuff: do you want JPEG support? Where is your JPEG library? - - LDLIBS += -ljpeg --#LDFLAGS += # -L/usr/local/lib -+LDFLAGS += -Wl,-R${LOCALBASE}/lib - DEFS += -DJPEG --#CFLAGS += -I/usr/local/include - ###################################################################### - - ###################################################################### - # X11 stuff: where are your X11 .h and .a files? - --LDFLAGS_X = -L/usr/X11R6/lib $(REMOTE_LDFLAGS) -+LDFLAGS_X = -L${X11BASE}/lib $(REMOTE_LDFLAGS) - LIBS_X = -lX11 -lXext $(REMOTE_LIBS) - ###################################################################### - -@@ -67,34 +77,34 @@ LIBS_X = -lX11 -lXext $(REMOTE_LIBS) - # If you're not compiling xcqcam, this section is irrelevant - - # xview remote --REMOTE_OBJS = xqcctl.o # code module for the remote --REMOTE_DEFS = -DREMOTE --REMOTE_LIBS = -lxview -lolgx # libraries necessary for the remote --REMOTE_LDFLAGS = -L/usr/openwin/lib # where to find libxview and libolgx --REMOTE_CFLAGS = -I/usr/openwin/include -+#REMOTE_OBJS = xqcctl.o # code module for the remote -+#REMOTE_DEFS = -DREMOTE -+#REMOTE_LIBS = -lxview -lolgx # libraries necessary for the remote -+#REMOTE_LDFLAGS = -L/usr/openwin/lib # where to find libxview and libolgx -+#REMOTE_CFLAGS = -I/usr/openwin/include - - # Tk remote --#REMOTE_OBJS = xqcctl-tk.o # code module for the remote --#REMOTE_DEFS = -DREMOTE --#REMOTE_LIBS = -lm -ldl -ltk -ltcl # libraries necessary for the remote --#REMOTE_LDFLAGS = --#REMOTE_CFLAGS = -+REMOTE_OBJS = xqcctl-tk.o # code module for the remote -+REMOTE_DEFS = -DREMOTE -+REMOTE_LIBS = -lm -L${PREFIX}/lib -ltk -ltcl # libraries necessary for the remote -+REMOTE_LDFLAGS = -+REMOTE_CFLAGS = -I${PREFIX}/include - ###################################################################### - - ###################################################################### - # Installation information --BINDIR = /usr/local/bin -+BINDIR = ${PREFIX}/bin - BINMODE = 4711 - BINUSER = root - BINGROUP = bin --MANDIR = /usr/local/man/man1 -+MANDIR = ${PREFIX}/man/man1 - ###################################################################### - - ###################################################################### - # Compiler information: where are CC and LD? - CC = cc - #CC = gcc --LD = cc -+LD = c++ - #LD = gcc - ###################################################################### - -@@ -132,13 +142,14 @@ install: bininstall maninstall - - bininstall: all - @echo -n Installing binaries... -- @install -o $(BINUSER) -g $(BINGROUP) -m $(BINMODE) $(PROGRAMS) $(BINDIR) -+ @install -c -s -o $(BINUSER) -g $(BINGROUP) -m $(BINMODE) $(PROGRAMS) $(BINDIR) - @echo " done" - - maninstall: cqcam.1 - @echo -n Installing man pages... -- @install -o root -g root -m 644 cqcam.1 $(MANDIR) -- @ln -sf cqcam.1 $(MANDIR)/xcqcam.1 -+ @install -c -o root -g wheel -m 644 cqcam.1 $(MANDIR) -+ @ln -sf cqcam.1.gz $(MANDIR)/xcqcam.1.gz -+ @ln -sf cqcam.1.gz $(MANDIR)/webcam.1.gz - @echo " done" - - clean: diff --git a/graphics/cqcam/patches/patch-ab b/graphics/cqcam/patches/patch-ab index a78f64ca4f5..ccbac1eb023 100644 --- a/graphics/cqcam/patches/patch-ab +++ b/graphics/cqcam/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.4 2004/07/10 22:18:23 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2007/01/08 04:51:44 rillig Exp $ ---- port.C.orig 1997-10-27 18:29:35.000000000 +0100 -+++ port.C -@@ -10,6 +10,7 @@ - +--- libcqcam/port.C.orig 2000-08-23 20:03:19.000000000 +0200 ++++ libcqcam/port.C 2007-01-08 05:25:04.000000000 +0100 +@@ -30,6 +30,7 @@ + #include "config.h" #include +#include #include - #include "config.h" -@@ -30,6 +31,10 @@ - #endif + #ifdef LOCKING +@@ -47,6 +48,10 @@ + #include #elif defined(FREEBSD) #include +#elif defined(NETBSD) @@ -20,8 +20,8 @@ $NetBSD: patch-ab,v 1.4 2004/07/10 22:18:23 wiz Exp $ +#include /* XXX */ #elif defined(BSDI) #include - #elif defined(LYNX) -@@ -62,6 +67,20 @@ port_t::port_t(int iport) { + #elif defined(OPENBSD) +@@ -90,6 +95,23 @@ port_t::port_t(int iport) { perror("fopen /dev/io"); return; } @@ -39,6 +39,9 @@ $NetBSD: patch-ab,v 1.4 2004/07/10 22:18:23 wiz Exp $ +# else +# error Not supported on this CPU. +# endif - #elif defined(LYNX) - if (io_access() < 0) { - perror("io_access"); ++#elif defined(LYNX) ++ if (io_access() < 0) { ++ perror("io_access"); + #elif defined(OPENBSD) + if (i386_iopl(1) == -1) { + perror("i386_iopl"); diff --git a/graphics/cqcam/patches/patch-ac b/graphics/cqcam/patches/patch-ac index ea31b32e887..0233618568a 100644 --- a/graphics/cqcam/patches/patch-ac +++ b/graphics/cqcam/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2001/01/07 04:05:03 thorpej Exp $ +$NetBSD: patch-ac,v 1.4 2007/01/08 04:51:44 rillig Exp $ ---- port.h.orig Sun Oct 26 17:10:19 1997 -+++ port.h Sat Jan 6 19:46:26 2001 -@@ -28,6 +28,9 @@ +--- libcqcam/port.h.orig 2000-08-23 20:03:19.000000000 +0200 ++++ libcqcam/port.h 2007-01-08 05:25:39.000000000 +0100 +@@ -43,6 +43,9 @@ #elif defined(FREEBSD) #include #include @@ -11,4 +11,4 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 04:05:03 thorpej Exp $ +#include #elif defined(BSDI) #include - #elif defined(LYNX) + #elif defined(OPENBSD) diff --git a/graphics/cqcam/patches/patch-ad b/graphics/cqcam/patches/patch-ad deleted file mode 100644 index 5cdc04354f3..00000000000 --- a/graphics/cqcam/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2002/06/27 20:40:12 agc Exp $ - ---- xscan.C 2002/06/27 20:28:59 1.1 -+++ xscan.C 2002/06/27 20:35:04 -@@ -141,8 +141,8 @@ - perror("shmget failed:"); - return (NULL); - } -- sbuf = ximage->data = SHMInfo.shmaddr = -- shmat(SHMInfo.shmid, 0, 0); -+ (void *)sbuf = (void *) ximage->data = (void *) SHMInfo.shmaddr = -+ (void *) shmat(SHMInfo.shmid, 0, 0); - - XShmAttach(disp, &SHMInfo); - diff --git a/graphics/cqcam/patches/patch-ae b/graphics/cqcam/patches/patch-ae deleted file mode 100644 index 33ca9d2ad97..00000000000 --- a/graphics/cqcam/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2004/07/10 22:18:23 wiz Exp $ - ---- camera.C.orig 1997-10-28 00:04:22.000000000 +0100 -+++ camera.C -@@ -3,6 +3,7 @@ - // by Patrick Reynolds - - #include -+#include - #include - #include - diff --git a/graphics/cqcam/patches/patch-af b/graphics/cqcam/patches/patch-af index 51d2d631600..568bc223fff 100644 --- a/graphics/cqcam/patches/patch-af +++ b/graphics/cqcam/patches/patch-af @@ -1,30 +1,31 @@ -$NetBSD: patch-af,v 1.2 2005/01/22 03:04:31 minskim Exp $ +$NetBSD: patch-af,v 1.3 2007/01/08 04:51:44 rillig Exp $ ---- xqcctl-tk.C.orig 1997-10-26 20:31:30.000000000 -0600 -+++ xqcctl-tk.C -@@ -6,6 +6,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -148,7 +149,7 @@ void xqc_quit(void) { +--- xfe/xqcctl-tk.C.orig 2001-07-11 20:40:20.000000000 +0200 ++++ xfe/xqcctl-tk.C 2007-01-08 05:28:08.000000000 +0100 +@@ -164,7 +164,7 @@ void xqc_quit(void) { } int SetCamValCmd(ClientData clientdata, Tcl_Interp *interp, -- int argc, char *argv[]) -+ int argc, const char *argv[]) +- int argc, char *argv[]) ++ int argc, const char *argv[]) { - char type; + char type = '\0'; long value = atoi(argv[2]); -@@ -163,7 +164,7 @@ int SetCamValCmd(ClientData clientdata, +@@ -179,7 +179,7 @@ int SetCamValCmd(ClientData clientdata, } int CamButtonCmd(ClientData clientdata, Tcl_Interp *interp, -- int argc, char *argv[]) -+ int argc, const char *argv[]) +- int argc, char *argv[]) ++ int argc, const char *argv[]) { - char type; + char type = '\0'; long value = 0; +@@ -190,7 +190,7 @@ int CamButtonCmd(ClientData clientdata, + return TCL_OK; + } + +-void ctl_main(int argc, char *argv[], int iout_fd, int iin_fd, ++void ctl_main(int argc, const char *argv[], int iout_fd, int iin_fd, + camera_t *cam, char *dpy_name) { + Tcl_Interp *interp; + int code; diff --git a/graphics/cqcam/patches/patch-ag b/graphics/cqcam/patches/patch-ag deleted file mode 100644 index 5cee0ed675a..00000000000 --- a/graphics/cqcam/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2004/07/10 22:18:23 wiz Exp $ - ---- imager.C.orig 1997-10-27 03:08:52.000000000 +0100 -+++ imager.C -@@ -9,6 +9,7 @@ - // Andre Jsemanowicz - - #include -+#include - #include "config.h" - #include - #include diff --git a/graphics/cqcam/patches/patch-ah b/graphics/cqcam/patches/patch-ah deleted file mode 100644 index 4d96ed7cdf4..00000000000 --- a/graphics/cqcam/patches/patch-ah +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2005/01/22 03:04:31 minskim Exp $ - ---- configure.orig 2005-01-21 20:52:15.000000000 -0600 -+++ configure -@@ -0,0 +1,4 @@ -+#! /bin/sh -+. $TCLCONFIG_SH -+$ECHO "LDLIBS+= $TCL_LIBS" > Makefile -+$CAT Makefile.in >> Makefile diff --git a/graphics/cqcam/patches/patch-ai b/graphics/cqcam/patches/patch-ai new file mode 100644 index 00000000000..a510f922222 --- /dev/null +++ b/graphics/cqcam/patches/patch-ai @@ -0,0 +1,16 @@ +$NetBSD: patch-ai,v 1.1 2007/01/08 04:51:44 rillig Exp $ + +--- configure.in.orig 2000-08-17 12:31:03.000000000 +0200 ++++ configure.in 2007-01-08 05:17:49.000000000 +0100 +@@ -145,6 +145,11 @@ case "$host_os" in + OS_LDFLAGS='-L/usr/local/lib' + OS_LIBCQCAM_OBJS='' + ;; ++ netbsd*) ++ OS_CFLAGS="-DNETBSD" ++ OS_LDFLAGS="-li386" ++ OS_LIBCQCAM_OBJS="" ++ ;; + openbsd*) + OS_CFLAGS='-O2 -DOPENBSD' + OS_LDFLAGS='-L/usr/local/lib' diff --git a/graphics/cqcam/patches/patch-aj b/graphics/cqcam/patches/patch-aj new file mode 100644 index 00000000000..f9bbabdb62c --- /dev/null +++ b/graphics/cqcam/patches/patch-aj @@ -0,0 +1,18 @@ +$NetBSD: patch-aj,v 1.1 2007/01/08 04:51:44 rillig Exp $ + +Tags: not-for-upstream + +--- configure.orig 2001-07-11 22:58:54.000000000 +0200 ++++ configure 2007-01-08 05:18:15.000000000 +0100 +@@ -1951,6 +1951,11 @@ case "$host_os" in + OS_LDFLAGS='-L/usr/local/lib' + OS_LIBCQCAM_OBJS='' + ;; ++ netbsd*) ++ OS_CFLAGS="-DNETBSD" ++ OS_LDFLAGS="-li386" ++ OS_LIBCQCAM_OBJS="" ++ ;; + openbsd*) + OS_CFLAGS='-O2 -DOPENBSD' + OS_LDFLAGS='-L/usr/local/lib' -- cgit v1.2.3