[pkgsrc/trunk]: pkgsrc/graphics/s10sh recognize a PowerShot A95

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bae3a3297d7d
branches:  trunk
changeset: 486078:bae3a3297d7d
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Dec 22 12:09:25 2004 +0000

description:
recognize a PowerShot A95

diffstat:

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

diffs (58 lines):

diff -r 595263b73dbe -r bae3a3297d7d graphics/s10sh/distinfo
--- a/graphics/s10sh/distinfo   Wed Dec 22 12:08:25 2004 +0000
+++ b/graphics/s10sh/distinfo   Wed Dec 22 12:09:25 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2004/02/25 20:29:50 drochner Exp $
+$NetBSD: distinfo,v 1.7 2004/12/22 12:09:25 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) = ad1b07a2062c53807df905edb14416f0ed701134
-SHA1 (patch-ad) = 59d3264cdbefe8762167e4bf03863b229139e095
-SHA1 (patch-ae) = d17537a51dbcb15af9a7c0b3a4f2db5122e539d8
+SHA1 (patch-ad) = 6e4164e2040508253075d5f482a527de9ff33d61
+SHA1 (patch-ae) = f22ee8feef8a8d99c91ecbdfc5dfd7e1751788b9
diff -r 595263b73dbe -r bae3a3297d7d graphics/s10sh/patches/patch-ad
--- a/graphics/s10sh/patches/patch-ad   Wed Dec 22 12:08:25 2004 +0000
+++ b/graphics/s10sh/patches/patch-ad   Wed Dec 22 12:09:25 2004 +0000
@@ -1,14 +1,15 @@
-$NetBSD: patch-ad,v 1.2 2004/02/19 19:59:35 drochner Exp $
+$NetBSD: patch-ad,v 1.3 2004/12/22 12:09:25 drochner Exp $
 
 --- usb.h.orig 2001-03-13 14:46:18.000000000 +0100
 +++ usb.h
-@@ -28,6 +28,9 @@
+@@ -28,6 +28,10 @@
  #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 */
++#define PRODUCT_ID_A95                0x30bb  /* PowerShot A95 */
  
  /* 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 595263b73dbe -r bae3a3297d7d graphics/s10sh/patches/patch-ae
--- a/graphics/s10sh/patches/patch-ae   Wed Dec 22 12:08:25 2004 +0000
+++ b/graphics/s10sh/patches/patch-ae   Wed Dec 22 12:09:25 2004 +0000
@@ -1,14 +1,15 @@
-$NetBSD: patch-ae,v 1.2 2004/02/19 19:59:35 drochner Exp $
+$NetBSD: patch-ae,v 1.3 2004/12/22 12:09:25 drochner Exp $
 
 --- usb.c.orig 2001-03-13 14:46:18.000000000 +0100
 +++ usb.c
-@@ -103,6 +103,9 @@ int USB_camera_init(struct usb_device **
+@@ -103,6 +103,10 @@ 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:
++                              case PRODUCT_ID_A95:
                                        *camera_dev = dev;
                                        printf("Unsupported Canon digicam "
                                               "found, S10sh will try to use "