Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2626.git;a=commitdiff;h=6022a3e89385c16b5a4261681885f731ba75bacc
commit 6022a3e89385c16b5a4261681885f731ba75bacc
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Thu Aug 7 00:09:07 2008 +0200
qc-usb-0.6.6-41-i686
- added kernel-2.6.26.patch
diff --git a/source/multimedia-extra/qc-usb/FrugalBuild
b/source/multimedia-extra/qc-usb/FrugalBuild
index 98b1a95..4372f62 100644
--- a/source/multimedia-extra/qc-usb/FrugalBuild
+++ b/source/multimedia-extra/qc-usb/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=qc-usb
pkgver=0.6.6
-pkgrel=40
+pkgrel=41
pkgdesc="Quickcam kernel driver."
groups=('multimedia-extra')
archs=('i686' 'x86_64')
@@ -11,9 +11,10 @@ _F_sourceforge_dirname="qce-ga"
Finclude sourceforge kernel-module
url="http://qce-ga.sourceforge.net/";
up2date="lynx -dump
http://sourceforge.net/project/showfiles.php?group_id=12924|grep qc-usb |sed
's/[^]]*][^]]*]\([^ ]*\) .*/\1/;q'"
-source=($source kernel-2.6.24.patch)
+source=($source kernel-2.6.2{4,6}.patch)
sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43' \
- 'e0362a80fc4d08d7cfa10899ded63b6eaf854ee7')
+ 'e0362a80fc4d08d7cfa10899ded63b6eaf854ee7' \
+ 'b549293fe695aa346b26a7d52c65ac142c4ae4bc')
build() {
Fpatchall
diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.26.patch
b/source/multimedia-extra/qc-usb/kernel-2.6.26.patch
new file mode 100644
index 0000000..a386337
--- /dev/null
+++ b/source/multimedia-extra/qc-usb/kernel-2.6.26.patch
@@ -0,0 +1,30 @@
+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 <[EMAIL PROTECTED]>
+--- 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 <[EMAIL PROTECTED]> */
+
++#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() */
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
