Mailinglist Archive: opensuse-commit (1124 mails)

< Previous Next >
commit uvcvideo
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 20 Apr 2007 16:00:45 +0200
  • Message-id: <20070420140045.79F56678168@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package uvcvideo
checked in at Fri Apr 20 16:00:45 CEST 2007.

--------
--- uvcvideo/uvcvideo.changes   2007-04-19 23:58:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/uvcvideo/uvcvideo.changes      2007-04-20 15:24:03.763485000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 20 15:23:54 CEST 2007 - ro@xxxxxxx
+
+- update to r95 and add isight patch 
+
+-------------------------------------------------------------------

Old:
----
  uvcvideo-r87.tar.bz2

New:
----
  isight.patch
  uvcvideo-r95.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ uvcvideo.spec ++++++
--- /var/tmp/diff_new_pack.J29045/_old  2007-04-20 16:00:26.000000000 +0200
+++ /var/tmp/diff_new_pack.J29045/_new  2007-04-20 16:00:26.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package uvcvideo (Version r87)
+# spec file for package uvcvideo (Version r95)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -16,9 +16,10 @@
 Group:          System/Kernel
 Autoreqprov:    on
 Summary:        USB Video Class (UVC) webcam driver
-Version:        r87
-Release:        5
+Version:        r95
+Release:        1
 Source:         %name-%version.tar.bz2
+Patch:          isight.patch
 URL:            http://linux-uvc.berlios.de/
 License:        GNU General Public License (GPL)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -59,6 +60,7 @@
 
 %prep
 %setup -n %name-%version
+%patch
 set -- *
 mkdir source
 mv "$@" source/
@@ -89,6 +91,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Apr 20 2007 - ro@xxxxxxx
+- update to r95 and add isight patch
 * Thu Apr 19 2007 - ro@xxxxxxx
 - no debuginfo (no main package)
 * Wed Apr 04 2007 - lrupp@xxxxxxx

++++++ isight.patch ++++++
++++ 665 lines (skipped)

++++++ uvcvideo-r87.tar.bz2 -> uvcvideo-r95.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/uvcvideo-r87/Makefile new/uvcvideo-r95/Makefile
--- old/uvcvideo-r87/Makefile   2007-02-07 17:22:41.000000000 +0100
+++ new/uvcvideo-r95/Makefile   2007-04-20 15:22:14.000000000 +0200
@@ -1,18 +1,12 @@
-ifneq ($(KERNELRELEASE),)   # We were called by kbuild
-CFLAGS += $(DEFINES) 
-obj-m          := uvcvideo.o
-uvcvideo-objs   := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o
-
-
-else   # We were called from command line
-
 KERNEL_VERSION := `uname -r`
 KERNEL_DIR     := /lib/modules/$(KERNEL_VERSION)/build
 INSTALL_MOD_DIR        := usb/media
 
 PWD            := $(shell pwd)
 
-default: uvcvideo
+obj-m          := uvcvideo.o
+uvcvideo-objs   := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o
+
 all: uvcvideo
 
 uvcvideo:
@@ -24,8 +18,6 @@
        @(cd $(KERNEL_DIR) && make -C $(KERNEL_DIR) SUBDIRS=$(PWD) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install)
        depmod -ae
 
-endif
-
 clean:
        -rm -f *.o *.ko .*.cmd .*.flags *.mod.c Modules.symvers
        -rm -rf .tmp_versions
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/uvcvideo-r87/Makefile~ new/uvcvideo-r95/Makefile~
--- old/uvcvideo-r87/Makefile~  2007-02-07 16:54:04.000000000 +0100
+++ new/uvcvideo-r95/Makefile~  1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-KERNEL_VERSION := `uname -r`
-KERNEL_DIR     := /lib/modules/$(KERNEL_VERSION)/build
-INSTALL_MOD_DIR        := usb/media
-
-PWD            := $(shell pwd)
-
-obj-m          := uvcvideo.o
-uvcvideo-objs   := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o
-
-default: uvcvideo
-all: uvcvideo
-
-uvcvideo:
-       @echo "Building USB Video Class driver..."
-       @(cd $(KERNEL_DIR) && make -C $(KERNEL_DIR) SUBDIRS=$(PWD) modules)
-
-install:
-       @echo "Installing USB Video Class driver..."
-       @(cd $(KERNEL_DIR) && make -C $(KERNEL_DIR) SUBDIRS=$(PWD) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install)
-       depmod -ae
-
-clean:
-       -rm -f *.o *.ko .*.cmd .*.flags *.mod.c Modules.symvers
-       -rm -rf .tmp_versions
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/uvcvideo-r87/uvc_ctrl.c new/uvcvideo-r95/uvc_ctrl.c
--- old/uvcvideo-r87/uvc_ctrl.c 2007-02-06 23:37:28.000000000 +0100
+++ new/uvcvideo-r95/uvc_ctrl.c 2007-04-20 15:22:14.000000000 +0200
@@ -447,6 +447,9 @@
        struct uvc_control_mapping *map;
        unsigned int i;
 
+       if (entity == NULL)
+               return NULL;
+
        for (i = 0; i < entity->ncontrols; ++i) {
                ctrl = &entity->controls[i];
                if (ctrl->info == NULL)
@@ -593,6 +596,9 @@
        unsigned int i;
        int ret;
 
+       if (entity == NULL)
+               return 0;
+
        for (i = 0; i < entity->ncontrols; ++i) {
                ctrl = &entity->controls[i];
                if (ctrl->info == NULL || !ctrl->dirty)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/uvcvideo-r87/uvc_driver.c new/uvcvideo-r95/uvc_driver.c
--- old/uvcvideo-r87/uvc_driver.c       2007-02-06 23:30:09.000000000 +0100
+++ new/uvcvideo-r95/uvc_driver.c       2007-04-20 15:22:14.000000000 +0200
@@ -200,7 +200,8 @@
        uint32_t multiplier;
 
        /* Saturate the result if the operation would overflow. */
-       if (numerator/denominator >= ((uint32_t)-1)/10000000)
+       if (denominator == 0 ||
+           numerator/denominator >= ((uint32_t)-1)/10000000)
                return (uint32_t)-1;
 
        /* Divide both the denominator and the multiplier by two until
@@ -859,7 +860,7 @@
 
                        unit->id = buffer[3];
                        unit->type = buffer[2];
-                       unit->selector.bNrInPins = buffer[5];
+                       unit->selector.bNrInPins = buffer[4];
                        unit->selector.baSourceID = (__u8*)unit + sizeof *unit;
                        memcpy(unit->selector.baSourceID, &buffer[5], p);
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/uvcvideo-r87/uvc_v4l2.c new/uvcvideo-r95/uvc_v4l2.c
--- old/uvcvideo-r87/uvc_v4l2.c 2006-12-29 22:44:48.000000000 +0100
+++ new/uvcvideo-r95/uvc_v4l2.c 2007-04-20 15:22:14.000000000 +0200
@@ -18,6 +18,7 @@
 #include <linux/usb.h>
 #include <linux/videodev.h>
 #include <linux/vmalloc.h>
+#include <linux/mm.h>
 #include <linux/wait.h>
 #include <asm/atomic.h>
 
@@ -970,6 +971,9 @@
        .open           = uvc_v4l2_open,
        .release        = uvc_v4l2_release,
        .ioctl          = uvc_v4l2_ioctl,
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+       .compat_ioctl   = v4l_compat_ioctl32,
+#endif
        .llseek         = no_llseek,
        .read           = uvc_v4l2_read,
        .mmap           = uvc_v4l2_mmap,


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread