SOURCES: libgphoto2-canon_A80_fix.patch - upt for version 2.1.6

aflinta aflinta at pld-linux.org
Thu Jun 23 23:24:47 CEST 2005


Author: aflinta                      Date: Thu Jun 23 21:24:47 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- upt for version 2.1.6

---- Files affected:
SOURCES:
   libgphoto2-canon_A80_fix.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/libgphoto2-canon_A80_fix.patch
diff -u SOURCES/libgphoto2-canon_A80_fix.patch:1.1 SOURCES/libgphoto2-canon_A80_fix.patch:1.2
--- SOURCES/libgphoto2-canon_A80_fix.patch:1.1	Fri Jun  3 10:50:47 2005
+++ SOURCES/libgphoto2-canon_A80_fix.patch	Thu Jun 23 23:24:42 2005
@@ -1,13 +1,11 @@
-diff -urN libgphoto2-2.1.5.orig/camlibs/canon/canon.c libgphoto2-2.1.5/camlibs/canon/canon.c
---- libgphoto2-2.1.5.orig/camlibs/canon/canon.c	2004-11-17 21:28:33.000000000 +0100
-+++ libgphoto2-2.1.5/camlibs/canon/canon.c	2005-05-30 19:30:17.000000000 +0200
-@@ -191,7 +191,7 @@
- 	/* Canon MVX3i / Optura Xi uses 308d in PTP mode; 3089 in Canon mode? */
+--- libgphoto2-2.1.6/camlibs/canon/canon.c.orig	2005-06-07 19:57:47.000000000 +0200
++++ libgphoto2-2.1.6/camlibs/canon/canon.c	2005-06-23 23:14:14.951959648 +0200
+@@ -223,7 +223,7 @@
  
- 	/* 0x3099 is the EOS 300D/Digital Rebel in PTP mode */
--	{"Canon:PowerShot A80 (normal mode)",	CANON_CLASS_1,	0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:PowerShot A80 (normal mode)",	CANON_CLASS_5,	0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 	{"Canon:PowerShot S60 (normal mode)",	CANON_CLASS_5,	0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 	{"Canon:Digital IXUS 500 (normal mode)",CANON_CLASS_5,	0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 	{"Canon:PowerShot A75",			CANON_CLASS_5,	0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-
+         /* 0x3099 is the EOS 300D/Digital Rebel in PTP mode */
+         /* A80 seems to share the ID for PTP and Canon modes */
+-        {"Canon:PowerShot A80 (normal mode)",   CANON_CLASS_1,  0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++        {"Canon:PowerShot A80 (normal mode)",   CANON_CLASS_5,  0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+         /* 0x309b is the SD10 Digital ELPH/Digital IXUS i/IXY Digital L
+            in PTP mode; will it work in Canon mode? */
+         {"Canon:PowerShot SD10 Digital ELPH (normal mode)",   CANON_CLASS_1,  0x04A9, 0x309B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libgphoto2-canon_A80_fix.patch?r1=1.1&r2=1.2&f=u




More information about the pld-cvs-commit mailing list