Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2637.git;a=commitdiff;h=29afb29af381d541932d26cef887c77be410fe06
commit 29afb29af381d541932d26cef887c77be410fe06 Author: Miklos Vajna <vmik...@frugalware.org> Date: Wed Jan 12 01:45:48 2011 +0100 qc-usb-0.6.6-77-i686 - rebuild with kernel-2.6.37 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index 62f0852..dfb2150 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,14 +3,14 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=76 +pkgrel=77 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}.patch) +source=($source kernel-2.6.2{4,6,7,8}.patch kernel-2.6.3{0,3,6,7}.patch) sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43' \ 'f77487fc75fe1a79d93813141448c04cc538a890' \ 'b549293fe695aa346b26a7d52c65ac142c4ae4bc' \ @@ -18,7 +18,8 @@ sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43' \ '1f8dd39d711f0160a6ce962989db6ad3550fccf4' \ 'b735e4219a429f6c574726377a106162a251ed10' \ '7ab1ba881d2d8b0b0f86c4557eb7b3601e6f6ccf' \ - '51276900abe7ea030a8c7d0c691f8be0140d741f') + '51276900abe7ea030a8c7d0c691f8be0140d741f' \ + '841a7662693d47fe0bbbe79f837b6410bc9e10f2') build() { Fpatchall diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.37.patch b/source/multimedia-extra/qc-usb/kernel-2.6.37.patch new file mode 100644 index 0000000..d5b02a3 --- /dev/null +++ b/source/multimedia-extra/qc-usb/kernel-2.6.37.patch @@ -0,0 +1,23 @@ +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