Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=38e934ac531bec931c1498d4737155527f33c7c2

commit 38e934ac531bec931c1498d4737155527f33c7c2
Author: James Buren <r...@frugalware.org>
Date:   Fri May 20 18:14:28 2011 -0500

qc-usb-0.6.6-83-x86_64
* remove package (incompatible with 2.6.39)

diff --git a/source/multimedia-extra/qc-usb/FrugalBuild 
b/source/multimedia-extra/qc-usb/FrugalBuild
deleted file mode 100644
index 281c74e..0000000
--- a/source/multimedia-extra/qc-usb/FrugalBuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Compiling Time: 0.07 SBU
-# Maintainer: Miklos Vajna <vmik...@frugalware.org>
-
-pkgname=qc-usb
-pkgver=0.6.6
-pkgrel=83
-pkgdesc="Quickcam kernel driver."
-groups=('multimedia-extra')
-archs=('i686' 'x86_64')
-_F_sourceforge_dirname="qce-ga"
-Finclude sourceforge kernel-module
-url="http://qce-ga.sourceforge.net/";
-source=($source kernel-2.6.2{4,6,7,8}.patch kernel-2.6.3{0,3,6,7}.patch)
-sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43' \
-          'f77487fc75fe1a79d93813141448c04cc538a890' \
-          'b549293fe695aa346b26a7d52c65ac142c4ae4bc' \
-          '5f7ccc2df2a017d8d6bdca2469aa65646e58685a' \
-          '1f8dd39d711f0160a6ce962989db6ad3550fccf4' \
-          'b735e4219a429f6c574726377a106162a251ed10' \
-          '7ab1ba881d2d8b0b0f86c4557eb7b3601e6f6ccf' \
-          '51276900abe7ea030a8c7d0c691f8be0140d741f' \
-          '841a7662693d47fe0bbbe79f837b6410bc9e10f2')
-
-build() {
-       Fpatchall
-       # hack
-       ln -s /usr/src/linux/drivers/staging/se401/videodev.h
-       Fsed '<linux/videodev.h>' '"videodev.h"' quickcam.h
-       # no Fcheckkernel, crosscompilation verified
-       make LINUX_DIR=$_F_kernelmod_dir/build all || return 1
-       Ffilerel $_F_kernelmod_dir/kernel/drivers/usb/misc/quickcam.ko
-       Fbuild_kernelmod_scriptlet
-}
diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.24.patch 
b/source/multimedia-extra/qc-usb/kernel-2.6.24.patch
deleted file mode 100644
index df546b7..0000000
--- a/source/multimedia-extra/qc-usb/kernel-2.6.24.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-by Stefan Lippers-Hollmann <s....@gmx.de>
-fixes kernel 2.6.24 compatibility.
-
-diff -urNad qc-usb-0.6.6~/qc-driver.c qc-usb-0.6.6/qc-driver.c
---- qc-usb-0.6.6~/qc-driver.c  2006-10-24 04:06:19.000000000 +0200
-+++ qc-usb-0.6.6/qc-driver.c   2007-12-09 17:20:30.000000000 +0100
-@@ -821,7 +821,9 @@
-       if (!cr) goto fail2;
-       urb->transfer_buffer = kmalloc(qc_i2c_maxbufsize*sizeof(u8), 
GFP_KERNEL);       /* Allocate maximum ever needed */
-       if (!urb->transfer_buffer) goto fail3;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-       spin_lock_init(&urb->lock);
-+#endif
-       urb->complete = qc_i2c_handler;
-       urb->context  = qc;
- #if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,9) && 
!defined(CONFIG_SUSE_KERNEL)) || LINUX_VERSION_CODE<KERNEL_VERSION(2,6,8)
-@@ -3006,7 +3008,9 @@
- static struct video_device qc_v4l_template = {
-       name:           "QuickCam USB",
-       type:           VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-       hardware:       VID_HARDWARE_QCAM_USB,
-+#endif
-       minor:          -1,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-       release:        qc_v4l_release,
-diff -urNad qc-usb-0.6.6~/quickcam.h qc-usb-0.6.6/quickcam.h
---- qc-usb-0.6.6~/quickcam.h   2006-11-04 14:38:27.000000000 +0100
-+++ qc-usb-0.6.6/quickcam.h    2007-12-09 17:17:01.000000000 +0100
-@@ -126,7 +126,9 @@
- #define FALSE                 0
- #define TRUE                  (!FALSE)
- typedef unsigned char Bool;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
- #define BIT(x)                (1<<(x))
-+#endif
- #define SIZE(a)               (sizeof(a)/sizeof((a)[0]))
- #define MAX(a,b)      ((a)>(b)?(a):(b))
- #define MIN(a,b)      ((a)<(b)?(a):(b))
---- a/qc-driver.c.ori  2008-04-18 13:44:38.000000000 +0200
-+++ b/qc-driver.c      2008-04-18 13:44:46.000000000 +0200
-@@ -3160,6 +3160,7 @@
-               /* Register V4L video device */
-               memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template));
-               qc->vdev.priv = qc;
-+              qc->vdev.dev = &(qc->dev->dev);
-               r = video_register_device(&qc->vdev, VFL_TYPE_GRABBER, 
video_nr);
-               if (r<0) goto fail3;
-               PRINTK(KERN_INFO, "Registered device: /dev/video%i", 
qc->vdev.minor);
diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.26.patch 
b/source/multimedia-extra/qc-usb/kernel-2.6.26.patch
deleted file mode 100644
index a386337..0000000
--- a/source/multimedia-extra/qc-usb/kernel-2.6.26.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From kernel 2.6.26rc2, SetPageReserved and ClearPageReserved changed from
-macros to inline functions, that are generated using macros (among which
-SETPAGEFLAG).
-
-The functions were redefined because they don't exist as macros, and then
-preventing compilation.
-
-This patch allows to compile the quickcam/qce-ga/qc-usb module on kernels
-2.6.26rc2 and later.
-
-An other fix could use #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26).
-
-Signed-off-by: Guillaume Bedot <little...@mandriva.org>
---- qc-usb-0.6.6.orig/qc-memory.c      2008-05-27 16:41:19.000000000 +0200
-+++ qc-usb-0.6.6/qc-memory.c   2008-05-27 16:41:35.000000000 +0200
-@@ -81,12 +81,14 @@
- #define pte_offset(pmd,adr)   pte_offset_map(pmd,adr) /* Emulation for a 
kernel using the new rmap-vm */
- #endif                                                        /* Fix by 
Michele Balistreri <brai...@gmx.net> */
-
-+#ifndef SETPAGEFLAG
- #ifndef SetPageReserved
- #define SetPageReserved(p)    mem_map_reserve(p)
- #endif
- #ifndef ClearPageReserved
- #define ClearPageReserved(p)  mem_map_unreserve(p)
- #endif
-+#endif
- /* }}} */
-
- /* {{{ [fold] kvirt_to_pa(): obtain physical address from virtual address 
obtained by vmalloc() */
diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.27.patch 
b/source/multimedia-extra/qc-usb/kernel-2.6.27.patch
deleted file mode 100644
index 1b0d74c..0000000
--- a/source/multimedia-extra/qc-usb/kernel-2.6.27.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Here are two fixes for compiling quickcam module with newer kernels.
-
-In 2.6.27-rc1 :
-1) the type field was removed from the video_device structure.
-2) the parent of the video device was renamed from dev to parent.
-
-Signed-off-by: Guillaume Bedot <little...@mandriva.org>
---- qc-usb-0.6.6-5mdv2009.0/qc-driver.c        2008-08-07 18:48:39.000000000 
+0200
-+++ qc-usb-0.6.6-6mdv2009.0/qc-driver.c        2008-09-05 13:51:20.000000000 
+0200
-@@ -2528,7 +2528,7 @@
-                       if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP");
-                       memset(&b, 0, sizeof(b));
-                       strcpy(b.name, "Logitech QuickCam USB");        /* Max 
31 characters */
--                      b.type      = qc->vdev.type;
-+                      b.type      = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE;
-                       b.channels  = 1;
-                       b.audios    = 0;
-                       b.maxwidth  = qc->sensor_data.maxwidth;
-@@ -3007,7 +3007,6 @@
-
- static struct video_device qc_v4l_template = {
-       name:           "QuickCam USB",
--      type:           VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-       hardware:       VID_HARDWARE_QCAM_USB,
- #endif
-@@ -3160,7 +3159,11 @@
-               /* Register V4L video device */
-               memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template));
-               qc->vdev.priv = qc;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+              qc->vdev.parent = &(qc->dev->dev);
-+#else
-               qc->vdev.dev = &(qc->dev->dev);
-+#endif
-               r = video_register_device(&qc->vdev, VFL_TYPE_GRABBER, 
video_nr);
-               if (r<0) goto fail3;
-               PRINTK(KERN_INFO, "Registered device: /dev/video%i", 
qc->vdev.minor);
diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.28.patch 
b/source/multimedia-extra/qc-usb/kernel-2.6.28.patch
deleted file mode 100644
index 371d844..0000000
--- a/source/multimedia-extra/qc-usb/kernel-2.6.28.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-The following upstream commit renders qc-usb FTBS:
-
-Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=601e9444f249d219009ec05674268d90f6f1cdcb
-Commit:     601e9444f249d219009ec05674268d90f6f1cdcb
-Parent:     e138c592b50370621653fd962b2bc3f4e25dfe78
-Author:     Hans Verkuil <hverk...@xs4all.nl>
-AuthorDate: Sat Aug 23 07:24:07 2008 -0300
-Committer:  Mauro Carvalho Chehab <mche...@redhat.com>
-CommitDate: Sun Oct 12 09:36:54 2008 -0200
-
-    V4L/DVB (8786): v4l2: remove the priv field, use dev_get_drvdata instead
-
-    Remove the priv field and let video_get/set_drvdata use dev_get_drvdata
-    and dev_set_drvdata instead.
-
-    Convert all drivers that still used priv directly.
-
-    Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>
-    Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
-
-Copyright (C) 2008 Stefan Lippers-Hollmann <s....@gmx.de>
-
-Cleaned up for Frugalware by Miklos Vajna.
-
-diff --git a/qc-driver.c b/qc-driver.c
-index 5e13fbb..09f2461 100644
---- a/qc-driver.c
-+++ b/qc-driver.c
-@@ -2255,7 +2255,11 @@ static unsigned int qc_v4l_poll(struct video_device 
*dev, struct file *file, pol
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-       struct video_device *dev = video_devdata(file);
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+      struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
-       struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
-       struct qc_frame_data *fd = &qc->frame_data;
-       int mask;
-
-@@ -2307,7 +2311,11 @@ static int qc_v4l_open(struct video_device *dev, int 
flags)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-       struct video_device *dev = video_devdata(file);
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+      struct quickcam *qc = video_get_drvdata(dev);
-+#else
-       struct quickcam *qc = dev->priv;
-+#endif
-       int r;
-
-       if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) 
PDEBUG("qc_v4l_open(qc=%p)", qc);
-@@ -2375,7 +2383,11 @@ static void qc_v4l_close(struct video_device *dev)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-       struct video_device *dev = video_devdata(file);
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+      struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
-       struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
-       if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) 
PDEBUG("qc_v4l_close(dev=%p,qc=%p)",dev,qc);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-       TEST_BUGR_MSG(qc==NULL, "qc==NULL");
-@@ -2423,7 +2435,11 @@ static long qc_v4l_read(struct video_device *dev, char 
*buf, unsigned long count
-       struct video_device *dev = video_devdata(file);
-       int noblock = file->f_flags & O_NONBLOCK;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+      struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
-       struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
-       int frame_len;
-       unsigned char *frame;
-       long r = 0;
-@@ -2478,7 +2494,11 @@ static int qc_v4l_mmap(
-       const void *start = (void *)vma->vm_start;
-       unsigned long size  = vma->vm_end - vma->vm_start;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+      struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
-       struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
-       unsigned char *frame;
-       int ret = 0,  frame_size;
- #if !HAVE_VMA && LINUX_VERSION_CODE<KERNEL_VERSION(2,6,0)
-@@ -2510,7 +2530,11 @@ static int qc_v4l_ioctl(struct video_device *dev, 
unsigned int cmd, void *argp)
-       struct video_device *dev = video_devdata(file);
-       void *argp = (void *)arg;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+      struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
-       struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
-       int i, retval = 0;
-
-       if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) 
PDEBUG("qc_v4l_ioctl(dev=%p,cmd=%u,arg=%p,qc=%p)",dev,cmd,argp,qc);
-@@ -3158,7 +3182,11 @@ PDEBUG("poisoning qc in qc_usb_init");
-
-               /* Register V4L video device */
-               memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template));
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+              video_set_drvdata(&qc->vdev, qc);
-+#else
-               qc->vdev.priv = qc;
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-               qc->vdev.parent = &(qc->dev->dev);
- #else
diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.30.patch 
b/source/multimedia-extra/qc-usb/kernel-2.6.30.patch
deleted file mode 100644
index 7c23924..0000000
--- a/source/multimedia-extra/qc-usb/kernel-2.6.30.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- qc-usb-0.6.6/qc-driver.c.orig      2009-06-12 20:52:20.000000000 +0200
-+++ qc-usb-0.6.6/qc-driver.c   2009-06-12 20:52:29.000000000 +0200
-@@ -994,7 +994,6 @@
-               PRINTK(KERN_WARNING,"Could not register procfs file entry");
-               return -ENXIO;
-       }
--      entry->owner = THIS_MODULE;
-       entry->data = qc;
-       entry->read_proc = qc_proc_read;
-       entry->write_proc = qc_proc_write;
-@@ -1032,7 +1031,6 @@
-                       return -ENXIO;
-               }
-       }
--      qc_proc_entry->owner = THIS_MODULE;
-       return 0;
- }
- /* }}} */
diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.33.patch 
b/source/multimedia-extra/qc-usb/kernel-2.6.33.patch
deleted file mode 100644
index a535730..0000000
--- a/source/multimedia-extra/qc-usb/kernel-2.6.33.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/qc-driver.c b/qc-driver.c
-index d303148..2f3a91b 100644
---- a/qc-driver.c
-+++ b/qc-driver.c
-@@ -49,8 +49,8 @@
- #include <linux/quickcam.h>
- #endif
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) || (HAVE_UTSRELEASE_H == 1)
--#include <linux/utsrelease.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18))
-+#include <generated/utsrelease.h>
- #endif
- #include <linux/module.h>
-
-diff --git a/qc-memory.c b/qc-memory.c
-index 39a95f5..aaf74d7 100644
---- a/qc-memory.c
-+++ b/qc-memory.c
-@@ -27,7 +27,7 @@
-  */
- /* }}} */
- /* {{{ [fold] Includes */
--#include <linux/autoconf.h>
-+#include <generated/autoconf.h>
- #include <linux/version.h>
-
- #ifdef CONFIG_SMP
-diff --git a/quickcam.h b/quickcam.h
-index 2b54bf2..2c8014d 100644
---- a/quickcam.h
-+++ b/quickcam.h
-@@ -76,7 +76,7 @@ struct qc_userlut {
-
- #ifdef __KERNEL__
-
--#include <linux/autoconf.h>
-+#include <generated/autoconf.h>
- #include <linux/version.h>
-
- #ifdef CONFIG_SMP
diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.36.patch 
b/source/multimedia-extra/qc-usb/kernel-2.6.36.patch
deleted file mode 100644
index be46f93..0000000
--- a/source/multimedia-extra/qc-usb/kernel-2.6.36.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/qc-driver.c b/qc-driver.c
-index 2f3a91b..7bedad6 100644
---- a/qc-driver.c
-+++ b/qc-driver.c
-@@ -2518,7 +2518,7 @@ fail:    if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in 
qc_v4l_mmap() : %i", qc, sem_
- /* }}} */
- /* {{{ [fold] qc_v4l_ioctl(struct video_device *dev, unsigned int cmd, void 
*arg) */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
--static int qc_v4l_ioctl(struct inode *inode, struct file *file, unsigned int 
cmd, unsigned long arg)
-+static long qc_v4l_ioctl(struct file *file, unsigned int cmd, unsigned long 
arg)
- #else
- static int qc_v4l_ioctl(struct video_device *dev, unsigned int cmd, void 
*argp)
- #endif
-@@ -3021,7 +3021,7 @@ static struct file_operations qc_v4l_fops = {
-       release:        qc_v4l_close,
-       read:           qc_v4l_read,
- //    write:          qc_v4l_write,
--      ioctl:          qc_v4l_ioctl,
-+      unlocked_ioctl: qc_v4l_ioctl,
-       mmap:           qc_v4l_mmap,
-       poll:           qc_v4l_poll,
- };
diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.37.patch 
b/source/multimedia-extra/qc-usb/kernel-2.6.37.patch
deleted file mode 100644
index d5b02a3..0000000
--- a/source/multimedia-extra/qc-usb/kernel-2.6.37.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/qc-driver.c b/qc-driver.c
-index b775e4c..d0aa071 100644
---- a/qc-driver.c
-+++ b/qc-driver.c
-@@ -190,7 +190,7 @@ static const struct qc_sensor *sensors[] = {
- };
-
- static LIST_HEAD(quickcam_list);              /* Linked list containing all 
QuickCams */
--static DECLARE_MUTEX(quickcam_list_lock);     /* Always lock first 
quickcam_list_lock, then qc->lock */
-+static DEFINE_SEMAPHORE(quickcam_list_lock);  /* Always lock first 
quickcam_list_lock, then qc->lock */
-
- /* Default values for user-specified lookup-table; may be overwritten by user 
*/
- static unsigned char userlut_contents[QC_LUT_SIZE] = {
-@@ -3128,7 +3128,8 @@ static struct quickcam *qc_usb_init(struct usb_device 
*usbdev, unsigned int ifac
- PDEBUG("poisoning qc in qc_usb_init");
-               POISON(*qc);
-               if (qcdebug&QC_DEBUGMUTEX) PDEBUG("init down(%p) in 
qc_usb_init()", qc);
--              init_MUTEX_LOCKED(&qc->lock);
-+              sema_init(&qc->lock, 1);
-+              down(&qc->lock);
-               qc->users = 0;
-               if ((r=qc_i2c_init(qc))<0) goto fail2;
-       }
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to