Author: lkundrak Update of /cvs/free/rpms/qc-usb-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14873 Modified Files: qc-usb-kmod.spec Added Files: qc-usb-0.6.6-2.6.27.patch Log Message: * Wed Oct 15 2008 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 0.6.6-42 - Re-enable ppc - Add 2.6.27 patch qc-usb-0.6.6-2.6.27.patch: --- NEW FILE qc-usb-0.6.6-2.6.27.patch --- 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. --- qc-usb-0.6.6/qc-driver.c.2.6.27 2008-10-15 21:40:01.000000000 +0200 +++ qc-usb-0.6.6/qc-driver.c 2008-10-15 21:40:01.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 Index: qc-usb-kmod.spec =================================================================== RCS file: /cvs/free/rpms/qc-usb-kmod/devel/qc-usb-kmod.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qc-usb-kmod.spec 4 Oct 2008 13:14:31 -0000 1.4 +++ qc-usb-kmod.spec 15 Oct 2008 19:52:52 -0000 1.5 @@ -3,11 +3,11 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -#define buildforkernels newest +%define buildforkernels current Name: qc-usb-kmod Version: 0.6.6 -Release: 41%{?dist}.1 +Release: 42%{?dist} Summary: qc-usb kernel modules Group: System Environment/Kernel @@ -17,12 +17,12 @@ Patch0: qc-usb-0.6.6-2.6.24.patch # from http://patch-tracking.debian.net/patch/series/view/qc-usb/0.6.6-6/kcompat... Patch1: qc-usb-0.6.6-2.6.26.patch +# this comes from mandriva package +Patch2: qc-usb-0.6.6-2.6.27.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i586 and i686 -ExclusiveArch: i586 i686 x86_64 -# ppc and ppc64 disabled by knurd on 20081003 as it is known to fail on 2.6.27: -# https://bugzilla.redhat.com/show_bug.cgi?id=465486 +ExclusiveArch: i586 i686 x86_64 ppc ppc64 # get the needed BuildRequires (in parts depending on what we build for) BuildRequires: %{_bindir}/kmodtool @@ -44,6 +44,7 @@ %setup -q -c -T -a 0 %patch0 -p0 -b .2.6.24 %patch1 -p0 -b .2.6.26 +%patch2 -p0 -b .2.6.27 for kernel_version in %{?kernel_versions}; do cp -a qc-usb-%{version} _kmod_build_${kernel_version%%___*} done @@ -69,6 +70,10 @@ %changelog +* Wed Oct 15 2008 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 0.6.6-42 +- Re-enable ppc +- Add 2.6.27 patch + * Fri Oct 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.6.6-41.1 - rebuild for rpm fusion