Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=2604ec4b7f4f19700265a4bf739ac60544025e90
commit 2604ec4b7f4f19700265a4bf739ac60544025e90
Author: Janos Kovacs <[EMAIL PROTECTED]>
Date: Thu Mar 6 19:37:54 2008 +0100
qc-usb-fwlive-0.6.6-31-i686
* version bump
diff --git a/source/multimedia-extra/qc-usb-fwlive/FrugalBuild
b/source/multimedia-extra/qc-usb-fwlive/FrugalBuild
index a501808..64f30c2 100644
--- a/source/multimedia-extra/qc-usb-fwlive/FrugalBuild
+++ b/source/multimedia-extra/qc-usb-fwlive/FrugalBuild
@@ -3,24 +3,27 @@
pkgname=qc-usb-fwlive
pkgver=0.6.6
-pkgrel=28
+pkgrel=31
pkgdesc="Quickcam kernel driver."
groups=('multimedia-extra')
archs=('i686' 'x86_64')
_F_sourceforge_dirname="qce-ga"
_F_sourceforge_name="qc-usb"
Finclude kernel-module sourceforge
-kver=2.6.23-6
+kver=2.6.24-3
depends=("kernel-fwlive=$kver")
makedepends=("kernel-fwlive-source=$kver")
_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'`
_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname"
url="http://qce-ga.sourceforge.net/";
+source=($source kernel-2.6.24.patch)
up2date="lynx -dump
http://sourceforge.net/project/showfiles.php?group_id=12924|grep qc-usb |sed
's/[^]]*][^]]*]\([^ ]*\) .*/\1/;q'"
-sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43')
+sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43' \
+ 'e0362a80fc4d08d7cfa10899ded63b6eaf854ee7')
build() {
Fcd qc-usb-$pkgver
+ Fpatchall
# no Fcheckkernel, crosscompilation verified
make LINUX_DIR=$_F_kernelmod_dir/build all || return 1
Ffilerel $_F_kernelmod_dir/kernel/drivers/usb/misc/quickcam.ko
diff --git a/source/multimedia-extra/qc-usb-fwlive/kernel-2.6.24.patch
b/source/multimedia-extra/qc-usb-fwlive/kernel-2.6.24.patch
new file mode 100644
index 0000000..2f7b0e0
--- /dev/null
+++ b/source/multimedia-extra/qc-usb-fwlive/kernel-2.6.24.patch
@@ -0,0 +1,39 @@
+by Stefan Lippers-Hollmann <[EMAIL PROTECTED]>
+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))
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
