Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (e0a3878336854d7f1ef7d846b7e4265896ec694d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (e0a3878336854d7f1ef7d846b7e4265896ec694d)
  • Date: Sun, 22 Oct 2006 15:56:50 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

video-libs/qc-usb/HISTORY | 5 ++++
video-libs/qc-usb/INSTALL | 2 -
video-libs/qc-usb/PRE_BUILD | 5 ++++
video-libs/qc-usb/qc-usb_gcc4.patch | 40
++++++++++++++++++++++++++++++++++++
4 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit b3526b856bb055c20f102b1d204310e9241ee81f
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

qc-usb: Fix compile with gcc4, bug #13171.

diff --git a/video-libs/qc-usb/HISTORY b/video-libs/qc-usb/HISTORY
index 0db262e..d6eeba4 100644
--- a/video-libs/qc-usb/HISTORY
+++ b/video-libs/qc-usb/HISTORY
@@ -1,3 +1,8 @@
+2006-10-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * qc-usb_gcc4.patch: Added, fix compile for gcc4 (bug #13171).
+ * PRE_BUILD: Added, apply patch.
+ * INSTALL: Added $INSTALL_ROOT to PREFIX.
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/video-libs/qc-usb/INSTALL b/video-libs/qc-usb/INSTALL
index b168e46..c24820c 100755
--- a/video-libs/qc-usb/INSTALL
+++ b/video-libs/qc-usb/INSTALL
@@ -1 +1 @@
-make PREFIX=/usr MODULE_DIR=$INSTALL_ROOT/lib/modules/$(get_kernel_version)
install
+make PREFIX=$INSTALL_ROOT/usr
MODULE_DIR=$INSTALL_ROOT/lib/modules/$(get_kernel_version) install
diff --git a/video-libs/qc-usb/PRE_BUILD b/video-libs/qc-usb/PRE_BUILD
new file mode 100755
index 0000000..fcafb57
--- /dev/null
+++ b/video-libs/qc-usb/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Fix compile for gcc4, bug #13171.
+patch -p1 < "$SCRIPT_DIRECTORY/qc-usb_gcc4.patch"
diff --git a/video-libs/qc-usb/qc-usb_gcc4.patch
b/video-libs/qc-usb/qc-usb_gcc4.patch
new file mode 100644
index 0000000..ef5345a
--- /dev/null
+++ b/video-libs/qc-usb/qc-usb_gcc4.patch
@@ -0,0 +1,40 @@
+diff -Naur qc-usb-0.6.4/qc-driver.c qc-usb-0.6.4/qc-driver.c
+--- qc-usb-0.6.4/qc-driver.c 2006-05-05 22:51:50.000000000 -0400
++++ qc-usb-0.6.4/qc-driver.c 2006-10-09 01:04:50.116022392 -0400
+@@ -867,7 +867,6 @@
+
+ out += sprintf(out, "\tGeneral driver status\n");
+ out += sprintf(out, "Driver version : %s\n", VERSION);
+- out += sprintf(out, "Kernel version : %s\n", UTS_RELEASE);
+ if (qc->dev!=NULL) {
+ out += sprintf(out, "Device Id : %04X:%04X\n",
(int)GET_VENDORID(qc), (int)GET_PRODUCTID(qc));
+ out += sprintf(out, "USB bus number : %i\n", qc->dev->bus->busnum);
+@@ -3266,8 +3265,8 @@
+
+ /* We found a QuickCam */
+ PRINTK(KERN_INFO,"QuickCam USB camera found (driver version %s)",
VERSION);
+- PRINTK(KERN_INFO,"Kernel:%s bus:%i class:%02X subclass:%02X
vendor:%04X product:%04X",
+- UTS_RELEASE, usbdev->bus->busnum, ifacedesc->bInterfaceClass,
ifacedesc->bInterfaceSubClass,
++ PRINTK(KERN_INFO,"bus:%i class:%02X subclass:%02X vendor:%04X
product:%04X",
++ usbdev->bus->busnum, ifacedesc->bInterfaceClass,
ifacedesc->bInterfaceSubClass,
+ usbdev->descriptor.idVendor, usbdev->descriptor.idProduct);
+
+ /* The interface is claimed (bound) automatically to us when we
return from this function (without error code) */
+diff -Naur qc-usb-0.6.4/quickcam.h qc-usb-0.6.4/quickcam.h
+--- qc-usb-0.6.4/quickcam.h 2006-05-05 23:00:26.000000000 -0400
++++ qc-usb-0.6.4/quickcam.h 2006-10-09 01:05:31.006577891 -0400
+@@ -93,12 +93,13 @@
+ #endif
+
+ #include <linux/videodev.h>
++#include <media/v4l2-dev.h>
+ #include <linux/usb.h>
+ #include <asm/pgtable.h> /* This is required for testing
pte_offset_map */
+ #include <linux/spinlock.h>
+
+ /* {{{ [fold] SECTION: user configuration */
+-#define VERSION "QuickCam USB 0.6.4 $Date: 2006/05/06
03:00:26 $"
++#define VERSION "QuickCam USB 0.6.4 $Date: 2006/05/02
13:05:20 $"
+ #ifndef COMPRESS
+ #define COMPRESS 1 /* 1=include compression support,
0=otherwise */
+ #endif



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (e0a3878336854d7f1ef7d846b7e4265896ec694d), Juuso Alasuutari, 10/22/2006

Archive powered by MHonArc 2.6.24.

Top of Page