rpms/qc-usb-kmod/F-9 qc-usb-0.6.6-2.6.27.patch, NONE, 1.1 qc-usb-kmod.spec, 1.5, 1.6

Author: thl Update of /cvs/free/rpms/qc-usb-kmod/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv12193 Modified Files: qc-usb-kmod.spec Added Files: qc-usb-0.6.6-2.6.27.patch Log Message: * Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.6.6-42 - 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/F-9/qc-usb-kmod.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qc-usb-kmod.spec 6 Nov 2008 11:09:28 -0000 1.5 +++ qc-usb-kmod.spec 6 Nov 2008 12:26:34 -0000 1.6 @@ -7,7 +7,7 @@ Name: qc-usb-kmod Version: 0.6.6 -Release: 41%{?dist}.3 +Release: 42%{?dist}.1 Summary: qc-usb kernel modules Group: System Environment/Kernel @@ -17,6 +17,8 @@ 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 @@ -42,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 @@ -67,6 +70,9 @@ %changelog +* Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.6.6-42 +- Add 2.6.27 patch + * Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.6.6-41.3 - rebuild for latest Fedora kernel;