diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Makefile | 2 | ||||
| -rw-r--r-- | graphics/smoke/Makefile | 64 | ||||
| -rw-r--r-- | graphics/smoke/distinfo | 3 | ||||
| -rw-r--r-- | graphics/smoke/files/patch-project | 11 | ||||
| -rw-r--r-- | graphics/smoke/files/patch-src_main.cc | 11 | ||||
| -rw-r--r-- | graphics/smoke/files/patch-src_store.h | 13 | ||||
| -rw-r--r-- | graphics/smoke/files/patch-src_stroke.cc | 10 | ||||
| -rw-r--r-- | graphics/smoke/pkg-descr | 10 | ||||
| -rw-r--r-- | graphics/smoke/pkg-plist | 5 | ||||
| -rw-r--r-- | graphics/vid/Makefile | 31 | ||||
| -rw-r--r-- | graphics/vid/distinfo | 3 | ||||
| -rw-r--r-- | graphics/vid/files/patch-Makefile | 10 | ||||
| -rw-r--r-- | graphics/vid/files/patch-aa | 277 | ||||
| -rw-r--r-- | graphics/vid/files/patch-ab | 11 | ||||
| -rw-r--r-- | graphics/vid/pkg-descr | 24 |
15 files changed, 0 insertions, 485 deletions
diff --git a/graphics/Makefile b/graphics/Makefile index cb10ef8d4451..2a41f344c6c6 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -542,7 +542,6 @@ SUBDIR += showimg SUBDIR += simage SUBDIR += skencil - SUBDIR += smoke SUBDIR += sng SUBDIR += snx101util SUBDIR += sodipodi @@ -575,7 +574,6 @@ SUBDIR += urt SUBDIR += vcg SUBDIR += vertex - SUBDIR += vid SUBDIR += view3ds SUBDIR += vigra SUBDIR += vips diff --git a/graphics/smoke/Makefile b/graphics/smoke/Makefile deleted file mode 100644 index ae8815ebfa54..000000000000 --- a/graphics/smoke/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# New ports collection makefile for: smoke -# Date created: 05 Feb 2004 -# Whom: Igor Pokrovsky <tiamat@comset.net> -# -# $FreeBSD$ -# - -PORTNAME= smoke -PORTVERSION= 0.5.1 -CATEGORIES= graphics -MASTER_SITES= # - -MAINTAINER= ip@doom.homeunix.org -COMMENT= Vector graphics OpenGL renderer - -BUILD_DEPENDS= ${LOCALBASE}/bin/tmake:${PORTSDIR}/devel/tmake -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 - -DEPRECATED= mastersite disappeared, no longer maintained by author -EXPIRATION_DATE=2006-02-28 - -USE_BZIP2= yes -USE_REINPLACE= yes -USE_SDL= yes -USE_GL= yes -USE_X_PREFIX= yes - -WRKSRC= ${WRKDIR}/${PORTNAME} - -FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config -TMAKE?= ${LOCALBASE}/bin/tmake -TMAKEPATH?= ${LOCALBASE}/share/tmake/freebsd-g++ - -PORTDOCS= README - -pre-everything:: - @${ECHO_MSG} "This port depends on SDL with OpenGL support." - @${ECHO_MSG} "If your SDL does not support OpenGL, hit ^C now and reinstall SDL" - @${ECHO_MSG} "with OpenGL support turned on." - -pre-configure: - @${REINPLACE_CMD} -e "s|%%FREETYPE_CONFIG%%|${FREETYPE_CONFIG}|g; \ - s|%%SDL_CONFIG%%|${SDL_CONFIG}|g; \ - s#%%FREETYPE_INCLUDEPATH%%#`${FREETYPE_CONFIG} --cflags | ${SED} -e 's|-I||g'`#; \ - s#%%SDL_INCLUDEPATH%%#`${SDL_CONFIG} --cflags | ${SED} -e 's|-I||g; s|-D[[:graph:]]*||g'`#; \ - s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ - ${WRKSRC}/project - -pre-build: - ${SETENV} TMAKEPATH=${TMAKEPATH} \ - ${TMAKE} ${WRKSRC}/project >${WRKSRC}/Makefile - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/smoke ${PREFIX}/bin - @${MKDIR} ${EXAMPLESDIR} - @${MKDIR} ${EXAMPLESDIR}/tests - ${INSTALL_DATA} ${WRKSRC}/tests/tiger.* ${EXAMPLESDIR}/tests -.ifndef (NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif - -.include <bsd.port.mk> diff --git a/graphics/smoke/distinfo b/graphics/smoke/distinfo deleted file mode 100644 index 931998fbcc88..000000000000 --- a/graphics/smoke/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (smoke-0.5.1.tar.bz2) = c0e46c652a5fcccd7b511fbb056a1fae -SHA256 (smoke-0.5.1.tar.bz2) = 09443c6ca53a28f6cb9ba635358879a68993a7aa01791b08af9e0dce9357e331 -SIZE (smoke-0.5.1.tar.bz2) = 192646 diff --git a/graphics/smoke/files/patch-project b/graphics/smoke/files/patch-project deleted file mode 100644 index 0c43bc2d951f..000000000000 --- a/graphics/smoke/files/patch-project +++ /dev/null @@ -1,11 +0,0 @@ ---- project.orig Thu Feb 5 19:06:25 2004 -+++ project Thu Feb 5 19:08:56 2004 -@@ -2,6 +2,6 @@ - HEADERS = src/*.h - SOURCES = src/bound.cc src/caches.cc src/colour.cc src/editing.h src/fill_types.cc src/geometry.cc src/gldisplaylist.cc src/load.cc src/main.cc src/scene.cc src/segments.cc src/store.h src/stroke.cc src/tesselate.cc src/test.cc src/tree.cc src/vecmat.cc src/viewport.cc src/usec_timer.cc src/utility.cc - TARGET = smoke --INCLUDEPATH = /usr/local/include -+INCLUDEPATH = %%FREETYPE_INCLUDEPATH%% %%SDL_INCLUDEPATH%% - DEFINES = _REENTRANT --LIBS = `freetype-config --libs` -lSDL -lpthread -lXxf86dga -lXxf86vm -lXv -+LIBS = `%%FREETYPE_CONFIG%% --libs` `%%SDL_CONFIG%% --libs` %%PTHREAD_LIBS%% -lXxf86dga -lXxf86vm -lXv diff --git a/graphics/smoke/files/patch-src_main.cc b/graphics/smoke/files/patch-src_main.cc deleted file mode 100644 index 5ce5bcf15bca..000000000000 --- a/graphics/smoke/files/patch-src_main.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main.cc.orig Thu Feb 5 20:36:50 2004 -+++ src/main.cc Thu Feb 5 20:36:58 2004 -@@ -36,7 +36,7 @@ - #include <string> - #include <GL/gl.h> - #include <GL/glu.h> --#include <SDL/SDL.h> -+#include <SDL.h> - - using namespace std; // Lots of IO - diff --git a/graphics/smoke/files/patch-src_store.h b/graphics/smoke/files/patch-src_store.h deleted file mode 100644 index 514692e05f61..000000000000 --- a/graphics/smoke/files/patch-src_store.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/store.h.orig Sat May 17 15:34:24 2003 -+++ src/store.h Mon May 24 22:08:54 2004 -@@ -32,8 +32,8 @@ - - #include <string> - #include <map> --#include <freetype/freetype.h> -- -+#include <ft2build.h> -+#include FT_FREETYPE_H - - - class Store diff --git a/graphics/smoke/files/patch-src_stroke.cc b/graphics/smoke/files/patch-src_stroke.cc deleted file mode 100644 index 64393baef416..000000000000 --- a/graphics/smoke/files/patch-src_stroke.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- src/stroke.cc.orig Sat Aug 14 21:16:17 2004 -+++ src/stroke.cc Sat Aug 14 21:16:27 2004 -@@ -24,6 +24,7 @@ - #include "store.h" - #include "segments.h" - -+#include <cmath> - - - // StrokeStyle diff --git a/graphics/smoke/pkg-descr b/graphics/smoke/pkg-descr deleted file mode 100644 index 1787201d55b6..000000000000 --- a/graphics/smoke/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Smoke is a development version of a vector graphics engine capable of storing, -manipulating and rendering vector graphics. - -A vector graphic image is represented by sets of lines and implicit curves. -These lines and curves are defined only by their coordinates on an imaginary -canvas. Thus a vector graphics image is resolution independent and can be -drawn into a pixmap of any size. - -- Igor Pokrovsky -tiamat@comset.net diff --git a/graphics/smoke/pkg-plist b/graphics/smoke/pkg-plist deleted file mode 100644 index e2f2fe85a9cd..000000000000 --- a/graphics/smoke/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/smoke -%%EXAMPLESDIR%%/tests/tiger.smoke -%%EXAMPLESDIR%%/tests/tiger.svg -@dirrm %%EXAMPLESDIR%%/tests -@dirrm %%EXAMPLESDIR%% diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile deleted file mode 100644 index e61a6a6a5786..000000000000 --- a/graphics/vid/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: vid -# Date created: Tue Dec 5 13:32:13 GMT 2000 -# Whom: Roger Hardiman <roger@freebsd.org> -# -# $FreeBSD$ -# - -PORTNAME= vid -PORTVERSION= 1.0.1 -PORTREVISION= 1 -CATEGORIES= graphics -MASTER_SITES= # - -MAINTAINER= ports@FreeBSD.org -COMMENT= Grab images from USB Cameras using the OV511 and OV511+ chipset - -LIB_DEPENDS= netpbm:${PORTSDIR}/graphics/netpbm - -DEPRECATED= mastersite disappeared, no longer maintained by author -EXPIRATION_DATE=2006-02-28 - -PLIST_FILES= bin/vid -# The port does not understand 'make all' or 'make install' -# so change the 'all_target' to be empty and use our own do-install handler. - -ALL_TARGET= - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/vid ${PREFIX}/bin - -.include <bsd.port.mk> diff --git a/graphics/vid/distinfo b/graphics/vid/distinfo deleted file mode 100644 index 5ee7b6fa0348..000000000000 --- a/graphics/vid/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (vid-1.0.1.tar.gz) = b23adc85c03cc5a21e3574559e6ee88b -SHA256 (vid-1.0.1.tar.gz) = af1eec3a543129cace972d9060207a03221674a31d1ceea1b75b97fdb8060919 -SIZE (vid-1.0.1.tar.gz) = 13986 diff --git a/graphics/vid/files/patch-Makefile b/graphics/vid/files/patch-Makefile deleted file mode 100644 index 2a4eade17bf8..000000000000 --- a/graphics/vid/files/patch-Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.old Sun Jul 7 21:56:30 2002 -+++ Makefile Sun Jul 7 21:56:38 2002 -@@ -6,7 +6,7 @@ - - CFLAGS = -O - CPPFLAGS = -I/usr/local/include --LIBS = -L/usr/local/lib -lpnm -+LIBS = -L/usr/local/lib -lnetpbm - - default: vid diff --git a/graphics/vid/files/patch-aa b/graphics/vid/files/patch-aa deleted file mode 100644 index 14c46c4e0c88..000000000000 --- a/graphics/vid/files/patch-aa +++ /dev/null @@ -1,277 +0,0 @@ ---- ../vid-1.0.1-old/vid.c Mon May 8 05:59:03 2000 -+++ vid.c Sun Apr 21 17:02:53 2002 -@@ -48,6 +48,7 @@ - struct usb_ctl_request ur; - unsigned char data[1024]; - -+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001) - ur.request.bmRequestType = UT_READ_VENDOR_INTERFACE; - ur.request.bRequest = 2; - -@@ -57,6 +58,17 @@ - ur.data = data; - ur.flags = 0; - ur.actlen = 0; -+#else -+ ur.ucr_request.bmRequestType = UT_READ_VENDOR_INTERFACE; -+ ur.ucr_request.bRequest = 2; -+ -+ USETW(ur.ucr_request.wValue, 0); /* unused */ -+ USETW(ur.ucr_request.wIndex, reg); /* index */ -+ USETW(ur.ucr_request.wLength, 1); /* payload len in bytes */ -+ ur.ucr_data = data; -+ ur.ucr_flags = 0; -+ ur.ucr_actlen = 0; -+#endif - - if(ioctl(fd, USB_DO_REQUEST, &ur) < 0) { - return -1; -@@ -72,6 +84,7 @@ - - data[0] = val; - -+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001) - ur.request.bmRequestType = UT_WRITE_VENDOR_INTERFACE; - ur.request.bRequest = 2; - -@@ -81,6 +94,17 @@ - ur.data = data; - ur.flags = 0; - ur.actlen = 0; -+#else -+ ur.ucr_request.bmRequestType = UT_WRITE_VENDOR_INTERFACE; -+ ur.ucr_request.bRequest = 2; -+ -+ USETW(ur.ucr_request.wValue, 0); /* unused */ -+ USETW(ur.ucr_request.wIndex, reg); /* index */ -+ USETW(ur.ucr_request.wLength, 1); /* payload len in bytes */ -+ ur.ucr_data = data; -+ ur.ucr_flags = 0; -+ ur.ucr_actlen = 0; -+#endif - - if(ioctl(fd, USB_DO_REQUEST, &ur) < 0) { - return -1; -@@ -217,12 +241,15 @@ - struct vidstate vs; /* current read state */ - int small = 0; /* use 320x240 */ - int frmnm = 0; /* cyclic frame number key */ -+ int isplus; /* bridge is OV511+ if true, else OV511 */ -+ int is20; /* sensor is OV7620 if true, else OV7610 */ -+ int bufsize; /* size of packet buffer */ - - /* pnm_init(&argc, argv); */ /* required for PNM programs? */ - - while(++argv, --argc) { - if(strcmp(*argv, "--version") == 0) { -- fprintf(stderr, "OV511 capture program version " VERSION -+ fprintf(stderr, "OV511/OV511+ capture program version " VERSION - "\nCopyright 2000 Peter S. Housel" - "\nThis program is free software; " - "you may redistribute it under the terms of" -@@ -235,7 +262,7 @@ - exit(0); - } else if(strcmp(*argv, "--help") == 0) { - fprintf(stderr, "usage: vid [options]\n" -- "Capture an image frame from an OV511-based USB video camera\n" -+ "Capture an image frame from an OV511/OV511+ based USB video camera\n" - "and write image data to standard output in PNM format\n\n" - "--version print program version information\n" - "--usage summarize command line options\n" -@@ -287,8 +314,14 @@ - exit(1); - } - -- if(udi.vendorNo != 0x05A9 || udi.productNo != 0x0511) { -- fprintf(stderr, "device %s is not an OmniVision OV511\n", devname); -+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001) -+ if(udi.vendorNo != 0x05A9 || (udi.productNo != 0x0511 && -+ udi.productNo != 0xa511)) { -+#else -+ if(udi.udi_vendorNo != 0x05A9 || (udi.udi_productNo != 0x0511 && -+ udi.udi_productNo != 0xa511)) { -+#endif -+ fprintf(stderr, "device %s is not an OmniVision OV511 or OV511+\n", devname); - exit(1); - } - } else { -@@ -297,8 +330,15 @@ - sprintf(dev, "/dev/ugen%d", i); - if((fd = open(dev, O_RDWR)) < 0) - continue; -+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001) -+ if(ioctl(fd, USB_GET_DEVICEINFO, &udi) < 0 -+ || udi.vendorNo != 0x05A9 || (udi.productNo != 0x0511 && -+ udi.productNo != 0xa511)) { -+#else - if(ioctl(fd, USB_GET_DEVICEINFO, &udi) < 0 -- || udi.vendorNo != 0x05A9 || udi.productNo != 0x0511) { -+ || udi.udi_vendorNo != 0x05A9 || (udi.udi_productNo != 0x0511 && -+ udi.udi_productNo != 0xa511)) { -+#endif - close(fd); - fd = -1; - continue; -@@ -308,12 +348,19 @@ - } - - if(fd < 0) { -- fprintf(stderr, "vid: couldn't locate an OV511 device\n"); -+ fprintf(stderr, "vid: couldn't locate an OV511 or OV511+ device\n"); - exit(1); - } - - devname = dev; - } -+ -+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001) -+ isplus = udi.productNo == 0xa511; -+#else -+ isplus = udi.udi_productNo == 0xa511; -+#endif -+ bufsize = (isplus ? 961 : 993); - - /* reset the OV511 */ - if(ov511_reg_write(fd, OV511_REG_RST, 0x7f) < 0) -@@ -398,23 +445,55 @@ - if(ov511_reg_write(fd, OV511_REG_CE_EN, 0x0) < 0) - exit(1); - -- ov511_i2c_write(fd, OV7610_REG_RWB, 0x5); -- ov511_i2c_write(fd, OV7610_REG_EC, 0xFF); -- ov511_i2c_write(fd, OV7610_REG_COMB, 0x01); -- ov511_i2c_write(fd, OV7610_REG_FD, 0x06); -- ov511_i2c_write(fd, OV7610_REG_COME, 0x1c); -- ov511_i2c_write(fd, OV7610_REG_COMF, 0x90); -- ov511_i2c_write(fd, OV7610_REG_ECW, 0x2e); -- ov511_i2c_write(fd, OV7610_REG_ECB, 0x7C); -- ov511_i2c_write(fd, OV7610_REG_COMH, 0x24); -- ov511_i2c_write(fd, OV7610_REG_EHSH, 0x04); -- ov511_i2c_write(fd, OV7610_REG_EHSL, 0xAC); -- ov511_i2c_write(fd, OV7610_REG_EXBK, 0xFE); -- ov511_i2c_write(fd, OV7610_REG_COMJ, 0x93); -- ov511_i2c_write(fd, OV7610_REG_BADJ, 0x48); -- ov511_i2c_write(fd, OV7610_REG_COMK, 0x81); -+ /* This returns 0 if we have an OV7620 sensor */ -+ if((is20 = ov511_i2c_read(fd, OV7610_REG_COMI)) < 0) -+ exit(1); -+ is20 = !is20; - -- ov511_i2c_write(fd, OV7610_REG_GAM, 0x04); -+ /* set up the OV7610/OV7620 */ -+ if(is20) { -+ ov511_i2c_write(fd, OV7610_REG_EC, 0xff); -+ ov511_i2c_write(fd, OV7610_REG_FD, 0x06); -+ ov511_i2c_write(fd, OV7610_REG_COMH, 0x24); -+ ov511_i2c_write(fd, OV7610_REG_EHSL, 0xac); -+ ov511_i2c_write(fd, OV7610_REG_COMA, 0x00); -+ ov511_i2c_write(fd, OV7610_REG_COMH, 0x24); -+ ov511_i2c_write(fd, OV7610_REG_RWB, 0x85); -+ ov511_i2c_write(fd, OV7610_REG_COMD, 0x01); -+ ov511_i2c_write(fd, 0x23, 0x00); -+ ov511_i2c_write(fd, OV7610_REG_ECW, 0x10); -+ ov511_i2c_write(fd, OV7610_REG_ECB, 0x8a); -+ ov511_i2c_write(fd, OV7610_REG_COMG, 0xe2); -+ ov511_i2c_write(fd, OV7610_REG_EHSH, 0x00); -+ ov511_i2c_write(fd, OV7610_REG_EXBK, 0xfe); -+ ov511_i2c_write(fd, 0x30, 0x71); -+ ov511_i2c_write(fd, 0x31, 0x60); -+ ov511_i2c_write(fd, 0x32, 0x26); -+ ov511_i2c_write(fd, OV7610_REG_YGAM, 0x20); -+ ov511_i2c_write(fd, OV7610_REG_BADJ, 0x48); -+ ov511_i2c_write(fd, OV7610_REG_COMA, 0x24); -+ ov511_i2c_write(fd, OV7610_REG_SYN_CLK, 0x01); -+ ov511_i2c_write(fd, OV7610_REG_BBS, 0x24); -+ ov511_i2c_write(fd, OV7610_REG_RBS, 0x24); -+ } else { -+ ov511_i2c_write(fd, OV7610_REG_RWB, 0x5); -+ ov511_i2c_write(fd, OV7610_REG_EC, 0xFF); -+ ov511_i2c_write(fd, OV7610_REG_COMB, 0x01); -+ ov511_i2c_write(fd, OV7610_REG_FD, 0x06); -+ ov511_i2c_write(fd, OV7610_REG_COME, 0x1c); -+ ov511_i2c_write(fd, OV7610_REG_COMF, 0x90); -+ ov511_i2c_write(fd, OV7610_REG_ECW, 0x2e); -+ ov511_i2c_write(fd, OV7610_REG_ECB, 0x7C); -+ ov511_i2c_write(fd, OV7610_REG_COMH, 0x24); -+ ov511_i2c_write(fd, OV7610_REG_EHSH, 0x04); -+ ov511_i2c_write(fd, OV7610_REG_EHSL, 0xAC); -+ ov511_i2c_write(fd, OV7610_REG_EXBK, 0xFE); -+ ov511_i2c_write(fd, OV7610_REG_COMJ, 0x93); -+ ov511_i2c_write(fd, OV7610_REG_BADJ, 0x48); -+ ov511_i2c_write(fd, OV7610_REG_COMK, 0x81); -+ -+ ov511_i2c_write(fd, OV7610_REG_GAM, 0x04); -+ } - - if(small) { - vs.width = 320; -@@ -442,14 +521,19 @@ - ov511_reg_write(fd, OV511_REG_LNDV, 0x00); - - /* set FIFO format (993-byte packets) */ -- if(ov511_reg_write(fd, OV511_REG_PKSZ, 0x1F) < 0) -+ if(ov511_reg_write(fd, OV511_REG_PKSZ, bufsize/32) < 0) - exit(1); - if(ov511_reg_write(fd, OV511_REG_PKFMT, 0x03) < 0) - exit(1); - - /* select the 993-byte alternative */ -+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001) - alt.interface_index = 0; -- alt.alt_no = 1; -+ alt.alt_no = (isplus ? 7 : 1); -+#else -+ alt.uai_interface_index = 0; -+ alt.uai_alt_no = (isplus ? 7 : 1); -+#endif - if(ioctl(fd, USB_SET_ALTINTERFACE, &alt) < 0) { - perror("USB_SET_ALTINTERFACE"); - exit(1); -@@ -475,36 +559,38 @@ - } - - /* read, looking for start and end frames */ -- while(vs.state != DONE && (len = read(isoc, &buf, 993)) >= 0) { -+ while(vs.state != DONE && (len = read(isoc, &buf, bufsize)) >= 0) { - if(buf[0] == 0 && buf[1] == 0 && buf[2] == 0 && buf[3] == 0 - && buf[4] == 0 && buf[5] == 0 && buf[6] == 0 && buf[7] == 0 -- && (buf[8] & 0x80) == 0 && buf[992] == 0 && vs.state == SKIPPING) { -+ && (buf[8] & 0x80) == 0 && buf[bufsize-1] == 0 && vs.state == SKIPPING) { - vs.state = READING; - vs.iY = vs.jY = vs.iUV = vs.jUV = 0; - vs.residue = 0; -- procdata(&vs, buf + 9, 993 - 10); -+ procdata(&vs, buf + 9, bufsize - 10); - } else if(buf[0] == 0 && buf[1] == 0 && buf[2] == 0 && buf[3] == 0 - && buf[4] == 0 && buf[5] == 0 && buf[6] == 0 && buf[7] == 0 -- && (buf[8] & 0x80) == 0x80 && buf[992] == 0 -+ && (buf[8] & 0x80) == 0x80 && buf[bufsize-1] == 0 - && vs.state == READING) { - vs.state = DONE; - } else if(vs.state == READING) { -- procdata(&vs, buf, 993 - 1); -+ procdata(&vs, buf, bufsize - 1); - - /* abort the capture and start over if packets come in out-of-order */ -- if(buf[992] != frmnm && buf[992] != 1) { -+ if(buf[bufsize-1] != frmnm && buf[bufsize-1] != 1) { - vs.state = SKIPPING; - } -- frmnm = buf[992] + 1; -+ frmnm = buf[bufsize-1] + 1; - if(frmnm == 256) - frmnm = 1; -- } else if(buf[992] != 0) { -- frmnm = buf[992] + 1; -+ } else if(buf[bufsize-1] != 0) { -+ frmnm = buf[bufsize-1] + 1; - if(frmnm == 256) - frmnm = 1; - } - } - -+ /* reset and close the OV511 */ -+ ov511_reg_write(fd, OV511_REG_RST, 0x7f); - close(isoc); - close(fd); - diff --git a/graphics/vid/files/patch-ab b/graphics/vid/files/patch-ab deleted file mode 100644 index f3c2bc6c803b..000000000000 --- a/graphics/vid/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- vid.h.old Mon May 8 00:59:03 2000 -+++ vid.h Wed Jan 31 14:21:52 2001 -@@ -37,6 +37,8 @@ - #define OV511_REG_CLKDIV 0x51 - #define OV511_REG_SNAP 0x52 - #define OV511_REG_EN_SYS 0x53 -+#define OV511_REG_PRW_CLK 0x54 -+#define OV511_REG_LED_CTL 0x55 - #define OV511_REG_USR 0x5E - #define OV511_REG_CID 0x5F - #define OV511_REG_PRH_Y 0x70 diff --git a/graphics/vid/pkg-descr b/graphics/vid/pkg-descr deleted file mode 100644 index e1c3ecfab068..000000000000 --- a/graphics/vid/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -vid is a Image Capture program for USB cameras using the -Omnivision OV511 and OV511+ chipset. - - -These include the - - Creative Labs WebCam 3 (*** see note about the OV511+ below ***) - D-Link DSB-C300 - Puretek PT-6007 - Alpha Vision Koala-Cam - Lifeview RoboCam - AverMedia InterCam Elite - MediaForte MV300 - Trust SpaceCam 300 (*** see note about the OV511+ below ***) - -The program was written by Peter Housel <housel@acm.org) and -is heavily based on the Linux OV511 driver from http://alpha.dyndns.org/ov511/ - -Notes On The OV511+ -------------------- -Josh Elsasser <jre@vineyard.net> has added support for OV511+ cameras. -Older Creative WebCam 3's use the OV511 but newer ones use the OV511+ - -On my OV511+ Trust SpaceCam 300 the image appears orange. I'm investigating. |