| 1 |
eva 08/02/02 23:43:54 |
| 2 |
|
| 3 |
Added: qc-usb-0.6.6-kcompat-2.6.24.patch |
| 4 |
Log: |
| 5 |
fix compilation with 2.6.24, bug #208568 |
| 6 |
(Portage version: 2.1.4.1) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/qc-usb/files/qc-usb-0.6.6-kcompat-2.6.24.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/qc-usb/files/qc-usb-0.6.6-kcompat-2.6.24.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/qc-usb/files/qc-usb-0.6.6-kcompat-2.6.24.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: qc-usb-0.6.6-kcompat-2.6.24.patch |
| 15 |
=================================================================== |
| 16 |
diff -urNad qc-usb-0.6.6~/qc-driver.c qc-usb-0.6.6/qc-driver.c |
| 17 |
--- qc-usb-0.6.6~/qc-driver.c 2006-10-24 04:06:19.000000000 +0200 |
| 18 |
+++ qc-usb-0.6.6/qc-driver.c 2007-12-09 17:20:30.000000000 +0100 |
| 19 |
@@ -821,7 +821,9 @@ |
| 20 |
if (!cr) goto fail2; |
| 21 |
urb->transfer_buffer = kmalloc(qc_i2c_maxbufsize*sizeof(u8), GFP_KERNEL); /* Allocate maximum ever needed */ |
| 22 |
if (!urb->transfer_buffer) goto fail3; |
| 23 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) |
| 24 |
spin_lock_init(&urb->lock); |
| 25 |
+#endif |
| 26 |
urb->complete = qc_i2c_handler; |
| 27 |
urb->context = qc; |
| 28 |
#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,9) && !defined(CONFIG_SUSE_KERNEL)) || LINUX_VERSION_CODE<KERNEL_VERSION(2,6,8) |
| 29 |
@@ -3006,7 +3008,9 @@ |
| 30 |
static struct video_device qc_v4l_template = { |
| 31 |
name: "QuickCam USB", |
| 32 |
type: VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE, |
| 33 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) |
| 34 |
hardware: VID_HARDWARE_QCAM_USB, |
| 35 |
+#endif |
| 36 |
minor: -1, |
| 37 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) |
| 38 |
release: qc_v4l_release, |
| 39 |
diff -urNad qc-usb-0.6.6~/quickcam.h qc-usb-0.6.6/quickcam.h |
| 40 |
--- qc-usb-0.6.6~/quickcam.h 2006-11-04 14:38:27.000000000 +0100 |
| 41 |
+++ qc-usb-0.6.6/quickcam.h 2007-12-09 17:17:01.000000000 +0100 |
| 42 |
@@ -126,7 +126,9 @@ |
| 43 |
#define FALSE 0 |
| 44 |
#define TRUE (!FALSE) |
| 45 |
typedef unsigned char Bool; |
| 46 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) |
| 47 |
#define BIT(x) (1<<(x)) |
| 48 |
+#endif |
| 49 |
#define SIZE(a) (sizeof(a)/sizeof((a)[0])) |
| 50 |
#define MAX(a,b) ((a)>(b)?(a):(b)) |
| 51 |
#define MIN(a,b) ((a)<(b)?(a):(b)) |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
-- |
| 56 |
gentoo-commits@l.g.o mailing list |
Archives