diff -ruN ov511-2.32/changelog ov511-2.32-2.6.22-skype/changelog --- ov511-2.32/changelog 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/changelog 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,94 @@ +ov511 (2.32-3) unstable; urgency=low + + * Put modules in /lib/modules/x.y.z/updates/ov511/ rather than in + /lib/modules/x.y.z/kernel/drivers/usb/media/ so that module-init-tools's + depmod gives them priority over the ones from the kernel. + + -- Mario Joussen Wed, 1 Nov 2006 16:25:30 +0100 + +ov511 (2.32-2) unstable; urgency=low + + * Added define HAVE_V4L2 if CONFIG_VIDEO_V4L2 is set to make it build + with Linux kernel 2.6.18. Thanks to Julien Valroff . + (closes: Bug#394572) + * Added support of module-assistant. + * Added debian/watch file. + + -- Mario Joussen Sat, 28 Oct 2006 15:31:42 +0200 + +ov511 (2.32-1) unstable; urgency=low + + * New upstream release. + (closes: Bug#268474, Bug#324503, Bug#324518, Bug#359541) + + -- Mario Joussen Tue, 17 Oct 2006 09:22:46 +0200 + +ov511 (1.65-2) unstable; urgency=low + + * Added Source line to modules control file. + (closes Bug#212332) + + -- Mario Joussen Tue, 23 Sep 2003 22:42:37 +0200 + +ov511 (1.65-1) unstable; urgency=low + + * New upstream release. + (closes Bug#191238) + + -- Mario Joussen Sun, 25 May 2003 21:18:30 +0200 + +ov511 (1.64-1) unstable; urgency=low + + * New upstream release. + + -- Mario Joussen Sun, 5 Jan 2003 13:39:04 +0100 + +ov511 (1.63-1) unstable; urgency=low + + * New upstream release. + + -- Mario Joussen Tue, 22 Oct 2002 23:31:20 +0200 + +ov511 (1.61-1) unstable; urgency=low + + * New upstream release. + + -- Mario Joussen Thu, 30 May 2002 14:27:20 +0200 + +ov511 (1.60-1) unstable; urgency=low + + * New upstream release. + + -- Mario Joussen Sun, 21 Apr 2002 13:27:06 +0200 + +ov511 (1.59-1) unstable; urgency=low + + * New upstream release. + + -- Mario Joussen Sat, 30 Mar 2002 13:09:03 +0100 + +ov511 (1.58-1) unstable; urgency=low + + * New upstream release. + * Changed debian/debian.module/rules to use 822-date instead of date. This + prevents errors, if the package is built with another locale than "C". + (closes: Bug#138289) + + -- Mario Joussen Fri, 15 Mar 2002 07:34:45 +0100 + +ov511 (1.57-1) unstable; urgency=low + + * New upstream release. + + -- Mario Joussen Sun, 10 Mar 2002 18:05:32 +0100 + +ov511 (1.54-1) unstable; urgency=low + + * Initial release. + (closes: Bug#135349) + + -- Mario Joussen Sat, 23 Feb 2002 12:10:38 +0100 + +Local variables: +mode: debian-changelog +End: diff -ruN ov511-2.32/compat ov511-2.32-2.6.22-skype/compat --- ov511-2.32/compat 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/compat 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1 @@ +5 diff -ruN ov511-2.32/control ov511-2.32-2.6.22-skype/control --- ov511-2.32/control 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/control 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,23 @@ +Source: ov511 +Section: graphics +Priority: extra +Maintainer: Mario Joussen +Build-Depends-Indep: bzip2 +Build-Depends: debhelper (>> 5.0.0) +Standards-Version: 3.7.2.2 + +Package: ov511-source +Architecture: all +Depends: module-assistant, debhelper (>> 5.0.0), bzip2 +Description: Driver source for the OV511, a USB-only chip used in many webcams + This package contains the device driver source for the OV511, a USB-only chip + used in many "webcam" devices. + . + Any camera using the OV511/OV511+ and the OV6620 or OV7610/20/20AE image + sensor should work. TV-capture devices with the SAA7111A decoder are + supported as well. It supports streaming and capture of color or monochrome + video via the Video4Linux API. Most V4L apps are compatible with it, and it + supports most image widths and heights that are multiples of 8. + . + This package contains the module source. The kernel driver can be built from + it using module-assistant or make-kpkg. diff -ruN ov511-2.32/control.modules.in ov511-2.32-2.6.22-skype/control.modules.in --- ov511-2.32/control.modules.in 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/control.modules.in 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,23 @@ +Source: ov511 +Section: graphics +Priority: extra +Maintainer: Mario Joussen +Build-Depends-Indep: debhelper (>> 5.0.0), bzip2 +Standards-Version: 3.7.2.2 + +Package: ov511-modules-_KVERS_ +Architecture: any +Depends: makedev +Recommends: kernel-image-_KVERS_ +Provides: ov511-modules +Description: Modules of OV511 USB Webcam Driver for the KVERS kernel + This package provides compiled modules for the OV511, a USB-only chip used in + many "webcam" devices. + . + Any camera using the OV511/OV511+ and the OV6620 or OV7610/20/20AE image + sensor should work. TV-capture devices with the SAA7111A decoder are + supported as well. It supports streaming and capture of color or monochrome + video via the Video4Linux API. Most V4L apps are compatible with it, and it + supports most image widths and heights that are multiples of 8. + . + These modules are intended for the _KVERS_ kernel package. diff -ruN ov511-2.32/copyright ov511-2.32-2.6.22-skype/copyright --- ov511-2.32/copyright 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/copyright 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,26 @@ +This package was debianized by Mario Joussen on +Sat, 23 Feb 2002 12:10:38 +0100. + +It was downloaded from http://alpha.dyndns.org/ov511/download/ + +Upstream Author: Mark W. McClelland + +Copyright (c) 1999-2002 Mark W. McClelland +Original decompression code Copyright 1998-2000 OmniVision Technologies + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in '/usr/share/common-licenses/GPL'. diff -ruN ov511-2.32/dirs ov511-2.32-2.6.22-skype/dirs --- ov511-2.32/dirs 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/dirs 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,2 @@ +/usr/src/modules/ov511 +/usr/src/modules/ov511/debian diff -ruN ov511-2.32/docs ov511-2.32-2.6.22-skype/docs --- ov511-2.32/docs 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/docs 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,2 @@ +ov511.txt +README diff -ruN ov511-2.32/docs.modules.in ov511-2.32-2.6.22-skype/docs.modules.in --- ov511-2.32/docs.modules.in 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/docs.modules.in 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,2 @@ +ov511.txt +README diff -ruN ov511-2.32/Makefile ov511-2.32-2.6.22-skype/Makefile --- ov511-2.32/Makefile 2006-03-28 17:47:31.000000000 +0200 +++ ov511-2.32-2.6.22-skype/Makefile 2007-11-20 19:31:11.000000000 +0100 @@ -1,7 +1,8 @@ -ifeq ($(shell uname -r | cut -d . -f 1-2),2.4) +KVERS = $(shell uname -r) +ifeq ($(shell echo $(KVERS) | cut -d . -f 1-2),2.4) #################################### OPTIONS ################################## # Change this to /usr/include if you get header file errors -INCLUDEDIR = /lib/modules/`uname -r`/build/include +INCLUDEDIR = /lib/modules/$(KVERS)/build/include ACFILE = $(INCLUDEDIR)/linux/autoconf.h @@ -14,8 +15,8 @@ endif # Detect extra required CFLAGS -EXTRA_CFLAGS := $(shell ./get_cflags.sh) -CFLAGS += $(EXTRA_CFLAGS) +#EXTRA_CFLAGS := $(shell ./get_cflags.sh) +#CFLAGS += $(EXTRA_CFLAGS) CC = gcc LD = ld @@ -94,7 +95,7 @@ endif # End kernel version test ############################ 2.6 kernel compile ############################### -ifeq ($(shell uname -r | cut -d . -f 1-2),2.6) +ifeq ($(shell echo $(KVERS) | cut -d . -f 1-2),2.6) ifneq ($(KERNELRELEASE),) # We were called by kbuild @@ -114,7 +115,7 @@ else # We were called from command line -KDIR := /lib/modules/$(shell uname -r)/build +KDIR := /lib/modules/$(KVERS)/build PWD := $(shell pwd) default: diff -ruN ov511-2.32/ov511_core.c ov511-2.32-2.6.22-skype/ov511_core.c --- ov511-2.32/ov511_core.c 2006-04-06 10:57:36.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ov511_core.c 2007-11-20 19:49:03.000000000 +0100 @@ -7,7 +7,7 @@ * Snapshot code by Kevin Moore * OV7620 fixes by Charl P. Botha * Changes by Claudio Matsuoka - * Kernel I2C interface improvements by Kyösti Mälkki + * Kernel I2C interface improvements by Ky�sti M�lkki * URB error messages and device_hint from pwc driver by Nemosoft * Small V4L pieces from bttv by Ralph & Marcus Metzler, Gerd Knorr, and * Justin Schoeman @@ -26,9 +26,14 @@ * option) any later version. NO WARRANTY OF ANY KIND is expressed or implied. */ -#include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + /* 2.6 Doesn't support /proc/video, but this is still defined somewhere */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) # undef CONFIG_VIDEO_PROC_FS @@ -147,6 +152,11 @@ static int clockdiv = -1; static int packetsize = -1; static int framedrop = -1; + +/* added for skype compatibility - begin */ +static int forceblock = 0; +/* added for skype compatibility - end */ + static int fastset; static int force_palette; static int tuner = -1; @@ -250,6 +260,11 @@ MODULE_PARM_DESC(v4l2, "Enable Video4Linux 2 support"); #endif +/* added for skype compatibility - begin */ +module_param(forceblock,int,S_IRUGO); +MODULE_PARM_DESC(forceblock, "Do a blocking Read regardless of the applications request"); +/* added for skype compatibility - end */ + MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); #if defined(MODULE_LICENSE) /* Introduced in ~2.4.10 */ @@ -3821,6 +3836,12 @@ PDEBUG(4, "opening"); + /* added for skype - compatibility - begin */ + if (forceblock){ + PDEBUG(3, "All reads will be blocking."); + } + /* added for skype - compatibility - end */ + down(&ov->lock); err = -ENODEV; @@ -4766,6 +4787,13 @@ int i, rc = 0, frmx = -1; struct ov511_frame *frame; + /* added for skype compatibility - begin */ + if (forceblock > 0){ + PDEBUG(4, "Force blocking read (noblock=0)"); + noblock = 0; + } + /* added for skype compatibility - end */ + if (down_interruptible(&ov->lock)) return -EINTR; @@ -5632,17 +5660,48 @@ } static CLASS_DEVICE_ATTR(exposure, S_IRUGO, show_exposure, NULL); -static void ov_create_sysfs(struct video_device *vdev) +static int ov_create_sysfs(struct video_device *vdev) { - video_device_create_file(vdev, &class_device_attr_custom_id); - video_device_create_file(vdev, &class_device_attr_model); - video_device_create_file(vdev, &class_device_attr_bridge); - video_device_create_file(vdev, &class_device_attr_sensor); - video_device_create_file(vdev, &class_device_attr_brightness); - video_device_create_file(vdev, &class_device_attr_saturation); - video_device_create_file(vdev, &class_device_attr_contrast); - video_device_create_file(vdev, &class_device_attr_hue); - video_device_create_file(vdev, &class_device_attr_exposure); + int rc; + rc = video_device_create_file(vdev, &class_device_attr_custom_id); + if (rc) goto err; + rc = video_device_create_file(vdev, &class_device_attr_model); + if (rc) goto err_id; + rc = video_device_create_file(vdev, &class_device_attr_bridge); + if (rc) goto err_model; + rc = video_device_create_file(vdev, &class_device_attr_sensor); + if (rc) goto err_bridge; + rc = video_device_create_file(vdev, &class_device_attr_brightness); + if (rc) goto err_sensor; + rc = video_device_create_file(vdev, &class_device_attr_saturation); + if (rc) goto err_bright; + rc = video_device_create_file(vdev, &class_device_attr_contrast); + if (rc) goto err_sat; + rc = video_device_create_file(vdev, &class_device_attr_hue); + if (rc) goto err_contrast; + rc = video_device_create_file(vdev, &class_device_attr_exposure); + if (rc) goto err_hue; + + return 0; + +err_hue: + video_device_remove_file(vdev, &class_device_attr_hue); +err_contrast: + video_device_remove_file(vdev, &class_device_attr_contrast); +err_sat: + video_device_remove_file(vdev, &class_device_attr_saturation); +err_bright: + video_device_remove_file(vdev, &class_device_attr_brightness); +err_sensor: + video_device_remove_file(vdev, &class_device_attr_sensor); +err_bridge: + video_device_remove_file(vdev, &class_device_attr_bridge); +err_model: + video_device_remove_file(vdev, &class_device_attr_model); +err_id: + video_device_remove_file(vdev, &class_device_attr_custom_id); +err: + return rc; } #endif @@ -5863,7 +5922,10 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) usb_set_intfdata(intf, ov); - ov_create_sysfs(ov->vdev); + if (ov_create_sysfs(ov->vdev)) { + err("ov_create_sysfs failed"); + goto error; + } #endif ov->present = 1; diff -ruN ov511-2.32/ov511_decomp.c ov511-2.32-2.6.22-skype/ov511_decomp.c --- ov511-2.32/ov511_decomp.c 2006-04-06 11:00:20.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ov511_decomp.c 2007-11-20 19:40:30.000000000 +0100 @@ -13,9 +13,14 @@ #define __NO_VERSION__ -#include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + #include "ov511.h" /* Variables in ov511.c: */ diff -ruN ov511-2.32/ov511.h ov511-2.32-2.6.22-skype/ov511.h --- ov511-2.32/ov511.h 2006-04-06 10:34:48.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ov511.h 2007-11-20 19:40:30.000000000 +0100 @@ -10,15 +10,25 @@ #ifndef __LINUX_OV511_H #define __LINUX_OV511_H +#if defined(CONFIG_VIDEO_V4L2) && !defined(HAVE_V4L2) +#define HAVE_V4L2 +#endif + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else #include +#endif #include #include #include #include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) #if defined (HAVE_V4L2) # include #endif +#endif #include "ovcamchip.h" diff -ruN ov511-2.32/ov518_decomp.c ov511-2.32-2.6.22-skype/ov518_decomp.c --- ov511-2.32/ov518_decomp.c 2006-04-06 10:58:21.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ov518_decomp.c 2007-11-20 19:40:30.000000000 +0100 @@ -14,9 +14,14 @@ #define __NO_VERSION__ -#include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + #include "ov511.h" /****************************************************************************** diff -ruN ov511-2.32/ov6x20.c ov511-2.32-2.6.22-skype/ov6x20.c --- ov511-2.32/ov6x20.c 2006-04-04 04:04:27.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ov6x20.c 2007-11-20 19:40:30.000000000 +0100 @@ -12,8 +12,14 @@ /* This file is not a module yet */ #define __NO_VERSION__ -#include #include + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + #include #include "ovcamchip_priv.h" diff -ruN ov511-2.32/ov6x30.c ov511-2.32-2.6.22-skype/ov6x30.c --- ov511-2.32/ov6x30.c 2006-04-04 04:04:33.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ov6x30.c 2007-11-20 19:40:30.000000000 +0100 @@ -12,8 +12,14 @@ /* This file is not a module yet */ #define __NO_VERSION__ -#include #include + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + #include #include "ovcamchip_priv.h" diff -ruN ov511-2.32/ov76be.c ov511-2.32-2.6.22-skype/ov76be.c --- ov511-2.32/ov76be.c 2006-04-04 04:04:39.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ov76be.c 2007-11-20 19:40:30.000000000 +0100 @@ -12,8 +12,14 @@ /* This file is not a module yet */ #define __NO_VERSION__ -#include #include + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + #include #include "ovcamchip_priv.h" diff -ruN ov511-2.32/ov7x10.c ov511-2.32-2.6.22-skype/ov7x10.c --- ov511-2.32/ov7x10.c 2006-04-04 04:04:46.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ov7x10.c 2007-11-20 19:40:30.000000000 +0100 @@ -14,8 +14,14 @@ /* This file is not a module yet */ #define __NO_VERSION__ -#include #include + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + #include #include "ovcamchip_priv.h" diff -ruN ov511-2.32/ov7x20.c ov511-2.32-2.6.22-skype/ov7x20.c --- ov511-2.32/ov7x20.c 2006-04-04 04:04:53.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ov7x20.c 2007-11-20 19:40:30.000000000 +0100 @@ -14,8 +14,14 @@ /* This file is not a module yet */ #define __NO_VERSION__ -#include #include + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + #include #include "ovcamchip_priv.h" diff -ruN ov511-2.32/ovcamchip_core.c ov511-2.32-2.6.22-skype/ovcamchip_core.c --- ov511-2.32/ovcamchip_core.c 2006-04-05 15:30:46.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ovcamchip_core.c 2007-11-20 19:40:30.000000000 +0100 @@ -9,8 +9,14 @@ * option) any later version. NO WARRANTY OF ANY KIND is expressed or implied. */ -#include #include + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + #include #include #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0) diff -ruN ov511-2.32/ovcamchip.h ov511-2.32-2.6.22-skype/ovcamchip.h --- ov511-2.32/ovcamchip.h 2006-04-04 04:05:07.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ovcamchip.h 2007-11-20 19:31:11.000000000 +0100 @@ -14,11 +14,19 @@ #ifndef __LINUX_OVCAMCHIP_H #define __LINUX_OVCAMCHIP_H +#if defined(CONFIG_VIDEO_V4L2) && !defined(HAVE_V4L2) +#define HAVE_V4L2 +#endif + #include #include #include "id.h" #include "compat.h" +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) && defined (HAVE_V4L2) +#include +#endif + /* --------------------------------- */ /* ENUMERATIONS */ /* --------------------------------- */ diff -ruN ov511-2.32/ovfx2.c ov511-2.32-2.6.22-skype/ovfx2.c --- ov511-2.32/ovfx2.c 2006-04-06 11:11:28.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ovfx2.c 2007-11-20 19:40:30.000000000 +0100 @@ -21,9 +21,14 @@ * option) any later version. NO WARRANTY OF ANY KIND is expressed or implied. */ -#include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + /* 2.6 Doesn't support /proc/video, but this is still defined somewhere */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) # undef CONFIG_VIDEO_PROC_FS diff -ruN ov511-2.32/ovfx2.h ov511-2.32-2.6.22-skype/ovfx2.h --- ov511-2.32/ovfx2.h 2006-04-06 10:57:57.000000000 +0200 +++ ov511-2.32-2.6.22-skype/ovfx2.h 2007-11-20 19:40:30.000000000 +0100 @@ -10,15 +10,26 @@ #ifndef __LINUX_OVFX2_H #define __LINUX_OVFX2_H +#if defined(CONFIG_VIDEO_V4L2) && !defined(HAVE_V4L2) +#define HAVE_V4L2 +#endif + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else #include +#endif + #include #include #include #include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) #if defined (HAVE_V4L2) # include #endif +#endif #include "ovcamchip.h" diff -ruN ov511-2.32/postinst ov511-2.32-2.6.22-skype/postinst --- ov511-2.32/postinst 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/postinst 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$1" = "configure" ]; then + if [ -d /usr/doc ] && [ -h /usr/doc/ov511-source ] && [ -d /usr/share/doc/ov511-source ]; then + rm -f /usr/doc/ov511-source + fi +fi + +#DEBHELPER# diff -ruN ov511-2.32/postinst.modules.in ov511-2.32-2.6.22-skype/postinst.modules.in --- ov511-2.32/postinst.modules.in 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/postinst.modules.in 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,16 @@ +#! /bin/sh + +set -e + +if [ ! -e /dev/.devfsd ] && [ ! -e /dev/video0 ] ; then + cd /dev + ./MAKEDEV video +fi + +if [ "`uname -r`" = "_KVERS_" ]; then + /sbin/depmod -a +fi + +#DEBHELPER# + +exit 0 diff -ruN ov511-2.32/README.Debian ov511-2.32-2.6.22-skype/README.Debian --- ov511-2.32/README.Debian 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/README.Debian 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,48 @@ +OV511 device driver +=================== + +This is a driver for the OV511, a USB-only chip used in many "webcam" devices. +Any camera using the OV511/OV511+ and the OV6620 or OV7610/20/20AE image sensor +should work. TV-capture devices with the SAA7111A decoder are supported as +well. It supports streaming and capture of color or monochrome video via the +Video4Linux API. Most V4L apps are compatible with it, and it supports most +image widths and heights that are multiples of 8. + + +Building a modules package using this package +--------------------------------------------- + +First you have to configure your kernel appropriately. You must select USB +(CONFIG_USB, (CONFIG_USB_UHCI|CONFIG_USB_UHCI_ALT|CONFIG_USB_OHCI)) and +Video4Linux (CONFIG_VIDEO_DEV) support for your kernel. Because the kernel +has an older version of this driver included, you should not select +CONFIG_USB_OV511 to avoid conflicts. + +The best way to build the modules package is with the help of module-assistant. +To do this, just run: + $ m-a a-i ov511 + +If you don't want to use modules-assistant, you can use kernel-package to +build the modules package. To do this, go to /usr/src and unpack the driver +source archive (ov511.tar.bz2). Then go to your kernel source directory +(usually /usr/src/kernel-source-*) and run: + $ fakeroot make-kpkg --added-modules ov511 modules_image + +Both ways will create the ov511 modules package in /usr/src named +"ov511-modules-_+_.deb". + +The last step is to install the built package as root with e.g.: + # dpkg -i ov511-modules-*.deb +and you're done! + +Note that the modules package cannot be built directly using dpkg-buildpackage. +If you don't want to go one of the ways described above, you can build the +package directly by changing to /usr/src/modules/ov511 and running: + $ fakeroot debian/rules KVERS=2.4.27 \ + KSRC=/usr/src/kernel-source-2.4.27 kdist_image + +Of course, you have to set the variables in this example command line to +appropriate values. + +-- +Mario Jou/3en diff -ruN ov511-2.32/rules ov511-2.32-2.6.22-skype/rules --- ov511-2.32/rules 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/rules 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,103 @@ +#!/usr/bin/make -f +# Copyright (C) 2002,2006 Mario Jou/3en +# Distributable under the terms of the GNU GPL version 2. + +#export DH_VERBOSE=1 + +DESTDIR := $(CURDIR)/debian/ov511-source/usr/src + +ifeq ($(shell echo $(KVERS) | sed -e 's/^2\.\(.*\)\.\(.*\)/\1/'),4) + MODDIR := /lib/modules/$(KVERS)/kernel/drivers/usb + MODULES := ov511.o ov511_decomp.o ov518_decomp.o ovcamchip.o +else + MODDIR := /lib/modules/$(KVERS)/updates/ov511 + MODULES := ov511.ko ovcamchip.ko ovfx2.ko saa7111-new.ko tda7313.ko +endif + +configure: configure-stamp +configure-stamp: debian/control debian/changelog + dh_testdir + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + install -m 644 Makefile README ov511.txt *.c *.h $(DESTDIR)/modules/ov511 + cp -a debian/compat debian/*modules.in debian/rules debian/copyright debian/changelog $(DESTDIR)/modules/ov511/debian + tar -C $(DESTDIR) -cvjf $(DESTDIR)/ov511.tar.bz2 modules + rm -rf $(DESTDIR)/modules + +binary-indep: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs +# dh_installexamples +# dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installman +# dh_installinfo +# dh_undocumented + dh_installchangelogs +# dh_link +# dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl +# dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: build install + +binary: binary-indep binary-arch + +PACKAGE = ov511-modules +MA_DIR ?= /usr/share/modass +-include $(MA_DIR)/include/generic.make +-include $(MA_DIR)/include/common-rules.make + +kdist_clean: prep-deb-files + dh_clean + $(MAKE) KDIR=$(KSRC) INCLUDEDIR=$(KSRC)/include KVERS=$(KVERS) clean + +kdist_config: prep-deb-files +binary-modules: kdist_config + dh_testdir + dh_testroot + dh_clean -k + $(MAKE) KDIR=$(KSRC) INCLUDEDIR=$(KSRC)/include KVERS=$(KVERS) + dh_installdirs $(MODDIR) + install -m 644 $(MODULES) $(CURDIR)/debian/$(PKGNAME)/$(MODDIR) + dh_installdocs + dh_installchangelogs + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol -- -v$(VERSION) + dh_md5sums + dh_builddeb --destdir=$(DEB_DESTDIR) + +.PHONY: build clean binary-indep binary-arch binary install configure binary-modules kdist kdist_config kdist_image kdist_clean diff -ruN ov511-2.32/saa7111-new.c ov511-2.32-2.6.22-skype/saa7111-new.c --- ov511-2.32/saa7111-new.c 2006-04-03 17:14:45.000000000 +0200 +++ ov511-2.32-2.6.22-skype/saa7111-new.c 2007-11-20 19:40:30.000000000 +0100 @@ -22,14 +22,21 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) +#include +#else +#include +#endif + #include #include #include #include #include #include +#include #include #include diff -ruN ov511-2.32/tda7313.c ov511-2.32-2.6.22-skype/tda7313.c --- ov511-2.32/tda7313.c 2006-04-04 04:03:06.000000000 +0200 +++ ov511-2.32-2.6.22-skype/tda7313.c 2007-11-20 19:31:11.000000000 +0100 @@ -19,6 +19,7 @@ #include #include #include +#include #include "id.h" #include "audiochip.h" diff -ruN ov511-2.32/watch ov511-2.32-2.6.22-skype/watch --- ov511-2.32/watch 1970-01-01 01:00:00.000000000 +0100 +++ ov511-2.32-2.6.22-skype/watch 2007-11-20 19:31:11.000000000 +0100 @@ -0,0 +1,2 @@ +version=3 +http://ovcam.org/ov511/download/2.xx/distros/ov511-([\d\.]+)\.tar\.bz2