[pkgsrc/trunk]: pkgsrc/graphics/s10sh this works with a EOS300 aka Digital Re...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4fb6d674d120
branches:  trunk
changeset: 469097:4fb6d674d120
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Feb 19 19:59:35 2004 +0000

description:
this works with a EOS300 aka Digital Rebel if forced to

diffstat:

 graphics/s10sh/distinfo         |  6 +++---
 graphics/s10sh/patches/patch-ad |  9 +++++----
 graphics/s10sh/patches/patch-ae |  9 +++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diffs (60 lines):

diff -r 4a97be9cb03d -r 4fb6d674d120 graphics/s10sh/distinfo
--- a/graphics/s10sh/distinfo   Thu Feb 19 19:28:29 2004 +0000
+++ b/graphics/s10sh/distinfo   Thu Feb 19 19:59:35 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/10/22 16:09:15 drochner Exp $
+$NetBSD: distinfo,v 1.5 2004/02/19 19:59:35 drochner Exp $
 
 SHA1 (s10sh-0.2.0.tar.gz) = a8ada7c84ff64be98a1195612d48e2042f293eba
 Size (s10sh-0.2.0.tar.gz) = 172203 bytes
 SHA1 (patch-aa) = 1708337ee44567e66e227903e0ae15101670ed31
 SHA1 (patch-ab) = 83e20d2bbda9de83a3db5a5990f6cc7f1fb1a18c
 SHA1 (patch-ac) = e41f7769729ae35ee412287a3bffc045f54079ae
-SHA1 (patch-ad) = 691819ca731ce6181deb4a2ded4ac81f575ce2cb
-SHA1 (patch-ae) = dd896e869507e9b50728f2d25c2bb23cb2195fb2
+SHA1 (patch-ad) = 59d3264cdbefe8762167e4bf03863b229139e095
+SHA1 (patch-ae) = d17537a51dbcb15af9a7c0b3a4f2db5122e539d8
diff -r 4a97be9cb03d -r 4fb6d674d120 graphics/s10sh/patches/patch-ad
--- a/graphics/s10sh/patches/patch-ad   Thu Feb 19 19:28:29 2004 +0000
+++ b/graphics/s10sh/patches/patch-ad   Thu Feb 19 19:59:35 2004 +0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-ad,v 1.1 2002/10/22 16:09:16 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2004/02/19 19:59:35 drochner Exp $
 
---- usb.h.orig Tue Oct 22 18:01:50 2002
-+++ usb.h      Tue Oct 22 18:03:37 2002
-@@ -28,6 +28,8 @@
+--- usb.h.orig 2001-03-13 14:46:18.000000000 +0100
++++ usb.h
+@@ -28,6 +28,9 @@
  #define PRODUCT_ID_S100_US    0x3045  /* S100, aka. Digital Ixus, Elph */
  #define PRODUCT_ID_S100_EU    0x3047  /* S100, aka. Digital Ixus, Elph */
  #define PRODUCT_ID_G1         0x3048  /* PowerShot G1 */
 +#define PRODUCT_ID_A20                0x304e  /* PowerShot A20 */
 +#define PRODUCT_ID_S330_US    0x3066  /* PowerShot S330, Digital Elph */
++#define PRODUCT_ID_EOS300D    0x3084  /* EOD 300D, Digital Rebel */
  
  /* The Canon USB protocol of the S10, S20, S100, G1 is the same.
   * We can hope that the next cameras will adopt a compatible protocol
diff -r 4a97be9cb03d -r 4fb6d674d120 graphics/s10sh/patches/patch-ae
--- a/graphics/s10sh/patches/patch-ae   Thu Feb 19 19:28:29 2004 +0000
+++ b/graphics/s10sh/patches/patch-ae   Thu Feb 19 19:59:35 2004 +0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-ae,v 1.1 2002/10/22 16:09:16 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2004/02/19 19:59:35 drochner Exp $
 
---- usb.c.orig Tue Oct 22 18:01:45 2002
-+++ usb.c      Tue Oct 22 18:04:23 2002
-@@ -103,6 +103,8 @@
+--- usb.c.orig 2001-03-13 14:46:18.000000000 +0100
++++ usb.c
+@@ -103,6 +103,9 @@ int USB_camera_init(struct usb_device **
                                case PRODUCT_ID_NEXTDIGICAM4:
                                case PRODUCT_ID_NEXTDIGICAM5:
                                case PRODUCT_ID_NEXTDIGICAM6:
 +                              case PRODUCT_ID_A20:
 +                              case PRODUCT_ID_S330_US:
++                              case PRODUCT_ID_EOS300D:
                                        *camera_dev = dev;
                                        printf("Unsupported Canon digicam "
                                               "found, S10sh will try to use "