forked from pool/isight-firmware-tools
Accepting request 102993 from hardware
Re-worked patch thath way that error is only emited if something is really wrong. (forwarded request 102972 from illuusio) OBS-URL: https://build.opensuse.org/request/show/102993 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/isight-firmware-tools?expand=0&rev=5
This commit is contained in:
commit
31cbe5de75
38
isight-firmware-tools-older_isight-1.6.0.diff
Normal file
38
isight-firmware-tools-older_isight-1.6.0.diff
Normal file
@ -0,0 +1,38 @@
|
||||
diff --git a/src/load.h b/src/load.h
|
||||
index ac5d354..7dc1b4f 100644
|
||||
--- a/src/load.h
|
||||
+++ b/src/load.h
|
||||
@@ -40,7 +40,8 @@
|
||||
#define _LOAD_H_
|
||||
|
||||
#define APPLE_VENDOR_ID 0x05AC
|
||||
-#define ISIGHT_PRODUCT_ID 0x8300
|
||||
+#define ISIGHT_PRODUCT_ID1 0x8300
|
||||
+#define ISIGHT_PRODUCT_ID2 0x8501
|
||||
|
||||
#define ift_debug(args...) syslog(LOG_DEBUG, args)
|
||||
#define ift_message(args...) syslog(LOG_INFO, args)
|
||||
diff --git a/src/udev.c b/src/udev.c
|
||||
index 004e773..94d43c2 100644
|
||||
--- a/src/udev.c
|
||||
+++ b/src/udev.c
|
||||
@@ -109,11 +109,18 @@ main(int argc, char *argv[])
|
||||
|
||||
|
||||
dev = find_usb_product(APPLE_VENDOR_ID,
|
||||
- ISIGHT_PRODUCT_ID);
|
||||
+ ISIGHT_PRODUCT_ID1);
|
||||
+
|
||||
+ /* If we can't open that device try another one. Older */
|
||||
+ if (!dev){
|
||||
+ dev = find_usb_product(APPLE_VENDOR_ID,
|
||||
+ ISIGHT_PRODUCT_ID2);
|
||||
+ }
|
||||
|
||||
if (!dev)
|
||||
ift_error(_("No iSight found"));
|
||||
|
||||
+
|
||||
if (load_firmware(dev, firmware) == -1)
|
||||
ift_error(_("Failed to upload firmware to 0x%04X:0x%04X"),
|
||||
dev->descriptor.idVendor,
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 07 07:35:09 UTC 2012 - tuukka.pasanen@ilmi.fi
|
||||
|
||||
- Added support for older iMac isight
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 2 07:35:09 UTC 2011 - idonmez@novell.com
|
||||
|
||||
|
@ -25,6 +25,7 @@ Summary: Tools to manipulate firmware for Built-in iSight
|
||||
Url: http://bersace03.free.fr/ift/
|
||||
Group: Amusements/Toys/Graphics
|
||||
Source: isight-firmware-tools-%{version}.tar.gz
|
||||
Patch0: isight-firmware-tools-older_isight-1.6.0.diff
|
||||
BuildRequires: gcc
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libgcrypt-devel
|
||||
@ -38,6 +39,7 @@ found on Apple machine since iMac G5 iSight
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
Loading…
Reference in New Issue
Block a user