pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/cqcam Updated cqcam to 0.91.
details: https://anonhg.NetBSD.org/pkgsrc/rev/ded9b3b5f1fd
branches: trunk
changeset: 523452:ded9b3b5f1fd
user: rillig <rillig%pkgsrc.org@localhost>
date: Mon Jan 08 04:51:44 2007 +0000
description:
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
diffstat:
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(-)
diffs (truncated from 452 to 300 lines):
diff -r 370b8dd132bb -r ded9b3b5f1fd graphics/cqcam/Makefile
--- a/graphics/cqcam/Makefile Mon Jan 08 04:40:27 2007 +0000
+++ b/graphics/cqcam/Makefile Mon Jan 08 04:51:44 2007 +0000
@@ -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@localhost
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 -r 370b8dd132bb -r ded9b3b5f1fd graphics/cqcam/PLIST
--- a/graphics/cqcam/PLIST Mon Jan 08 04:40:27 2007 +0000
+++ b/graphics/cqcam/PLIST Mon Jan 08 04:51:44 2007 +0000
@@ -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/movify
+bin/webcam
bin/xcqcam
-bin/webcam
man/man1/cqcam.1
man/man1/webcam.1
man/man1/xcqcam.1
diff -r 370b8dd132bb -r ded9b3b5f1fd graphics/cqcam/distinfo
--- a/graphics/cqcam/distinfo Mon Jan 08 04:40:27 2007 +0000
+++ b/graphics/cqcam/distinfo Mon Jan 08 04:51:44 2007 +0000
@@ -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 -r 370b8dd132bb -r ded9b3b5f1fd graphics/cqcam/patches/patch-aa
--- a/graphics/cqcam/patches/patch-aa Mon Jan 08 04:40:27 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 370b8dd132bb -r ded9b3b5f1fd graphics/cqcam/patches/patch-ab
--- a/graphics/cqcam/patches/patch-ab Mon Jan 08 04:40:27 2007 +0000
+++ b/graphics/cqcam/patches/patch-ab Mon Jan 08 04:51:44 2007 +0000
@@ -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 <stdio.h>
+#include <stdlib.h>
#include <errno.h>
- #include "config.h"
-@@ -30,6 +31,10 @@
- #endif
+ #ifdef LOCKING
+@@ -47,6 +48,10 @@
+ #include <conio.h>
#elif defined(FREEBSD)
#include <machine/cpufunc.h>
+#elif defined(NETBSD)
@@ -20,8 +20,8 @@
+#include <machine/pio.h> /* XXX */
#elif defined(BSDI)
#include <machine/inline.h>
- #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 @@
+# 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 -r 370b8dd132bb -r ded9b3b5f1fd graphics/cqcam/patches/patch-ac
--- a/graphics/cqcam/patches/patch-ac Mon Jan 08 04:40:27 2007 +0000
+++ b/graphics/cqcam/patches/patch-ac Mon Jan 08 04:51:44 2007 +0000
@@ -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 <machine/cpufunc.h>
#include <stdio.h>
@@ -11,4 +11,4 @@
+#include <machine/pio.h>
#elif defined(BSDI)
#include <machine/inline.h>
- #elif defined(LYNX)
+ #elif defined(OPENBSD)
diff -r 370b8dd132bb -r ded9b3b5f1fd graphics/cqcam/patches/patch-ad
--- a/graphics/cqcam/patches/patch-ad Mon Jan 08 04:40:27 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index