Mailinglist Archive: opensuse-commit (1192 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package quickcam
checked in at Thu Aug 28 12:56:43 CEST 2008.


--------
--- quickcam/quickcam.changes   2008-07-21 10:49:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/quickcam/quickcam.changes      2008-08-28 
11:29:35.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 28 11:29:27 CEST 2008 - olh@xxxxxxx
+
+- build fixes for 2.6.27
+
+-------------------------------------------------------------------



New:
----
  qc-usb-messenger.video_device-type.patch
  qc-usb.video_device-type.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ quickcam.spec ++++++
--- /var/tmp/diff_new_pack.P21445/_old  2008-08-28 12:56:24.000000000 +0200
+++ /var/tmp/diff_new_pack.P21445/_new  2008-08-28 12:56:24.000000000 +0200
@@ -2,9 +2,16 @@
 # spec file for package quickcam (Version 0.6.6)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -16,7 +23,7 @@
 BuildRequires:  kernel-syms module-init-tools
 Url:            http://qce-ga.sourceforge.net/
 Version:        0.6.6
-Release:        6
+Release:        7
 %define qc_usb_messenger qc-usb-messenger-1.8
 License:        LGPL v2.1 or later
 Group:          System/Kernel
@@ -33,10 +40,12 @@
 Patch6:         qc-usb-urb_lock.patch
 Patch8:         qc-usb.pt_regs.patch
 Patch9:         qc-usb-mem_map_reserve.patch
+Patch10:        qc-usb.video_device-type.patch
 Patch21:        qc-usb-messenger.UTS_RELEASE.patch
 Patch25:        qc-usb-messenger-mem_map_reserve.patch
 Patch26:        qc-usb-messenger-sem_getcount.patch
 Patch27:        qc-usb-messenger-input_dev-private.patch
+Patch28:        qc-usb-messenger.video_device-type.patch
 %suse_kernel_module_package -x default ppc64 smp bigsmp pae
 
 %description
@@ -79,11 +88,13 @@
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 cd %{qc_usb_messenger}
 %patch21 -p1
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 %build
 mkdir source obj
@@ -144,6 +155,8 @@
 done
 
 %changelog
+* Thu Aug 28 2008 olh@xxxxxxx
+- build fixes for 2.6.27
 * Mon Jul 21 2008 olh@xxxxxxx
 - update to qc-usb-messenger-1.8
   build fixes for 2.6.26

++++++ qc-usb-messenger.video_device-type.patch ++++++
---
 qc-driver.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- a/qc-driver.c
+++ b/qc-driver.c
@@ -2894,7 +2894,11 @@ static int qc_v4l_ioctl(struct video_dev
                        if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP");
                        memset(&b, 0, sizeof(b));
                        strcpy(b.name, "Logitech QuickCam USB");        /* Max 
31 characters */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+                       b.type      = qc->vdev.vfl_type;
+#else
                        b.type      = qc->vdev.type;
+#endif
                        b.channels  = 1;
                        b.audios    = 0;
                        b.maxwidth  = qc->sensor_data.maxwidth;
@@ -3483,7 +3487,9 @@ static struct file_operations qc_v4l_fop
 
 static struct video_device qc_v4l_template = {
        name:           "QuickCam USB",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
        type:           VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE,
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        hardware:       VID_HARDWARE_QCAM_USB,
 #endif
++++++ qc-usb.video_device-type.patch ++++++
---
 qc-driver.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- a/qc-driver.c
+++ b/qc-driver.c
@@ -2516,7 +2516,11 @@ static int qc_v4l_ioctl(struct video_dev
                        if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP");
                        memset(&b, 0, sizeof(b));
                        strcpy(b.name, "Logitech QuickCam USB");        /* Max 
31 characters */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+                       b.type      = qc->vdev.vfl_type;
+#else
                        b.type      = qc->vdev.type;
+#endif
                        b.channels  = 1;
                        b.audios    = 0;
                        b.maxwidth  = qc->sensor_data.maxwidth;
@@ -2995,7 +2999,9 @@ static struct file_operations qc_v4l_fop
 
 static struct video_device qc_v4l_template = {
        name:           "QuickCam USB",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
        type:           VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
+#endif
        minor:          -1,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
        release:        qc_v4l_release,

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx