Adding prefix from cvs. Closes #30880

4 files changed, 123 insertions, 6 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 8c2339e3a086..4942b0076ccf 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.12 2003/10/08 21:29:42 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.13 2003/10/12 19:41:18 mholzer Exp $
+
+  13 Oct 2003; Martin Holzer <mholzer@gentoo.org> libgphoto2-2.1.2-r1.ebuild,
+  files/libgphoto2-2.1.2-canon.patch:
+  Adding prefix from cvs. Closes #30880.
 
   08 Oct 2003; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.1-r3.ebuild,
   libgphoto2-2.1.2-r1.ebuild, libgphoto2-2.1.2.ebuild:
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index b6c16014869a..74180835bbb6 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,9 +1,10 @@
-MD5 c9d104b6d22e6cdcc96ef09f1c963238 ChangeLog 2349
+MD5 df6df3a21459cc723201d8ebac030466 ChangeLog 2507
 MD5 829031ca68853e6d35c5d4adf780d8d9 libgphoto2-2.1.1-r2.ebuild 1393
-MD5 30a81588e56a2ef2ea8654a0094b3efe libgphoto2-2.1.2-r1.ebuild 2190
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
+MD5 b3da41dc7a487088691db163e40cb24d libgphoto2-2.1.2-r1.ebuild 2242
 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r2 70
-MD5 1e1dae62e219b69ed37673f1d0fe01f9 files/digest-libgphoto2-2.1.2-r1 70
 MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533
+MD5 14d496f3b88571d345f9f6547f5bd675 files/libgphoto2-2.1.2-canon.patch 5470
 MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533
+MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
+MD5 1e1dae62e219b69ed37673f1d0fe01f9 files/digest-libgphoto2-2.1.2-r1 70
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch
new file mode 100644
index 000000000000..f7789eca2f9c
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch
@@ -0,0 +1,111 @@
+diff -r -u libgphoto2-2.1.2.orig/camlibs/canon/canon.c libgphoto2-2.1.2/camlibs/canon/canon.c
+--- libgphoto2-2.1.2.orig/camlibs/canon/canon.c	2003-08-10 13:51:13.000000000 -0500
++++ libgphoto2-2.1.2/camlibs/canon/canon.c	2003-10-12 11:21:10.000000000 -0500
+@@ -15,7 +15,7 @@
+  * and usb.c, keeping the common protocols/busses support in this
+  * file.
+  *
+- * $Id: libgphoto2-2.1.2-canon.patch,v 1.1 2003/10/12 19:41:18 mholzer Exp $
++ * $Id: libgphoto2-2.1.2-canon.patch,v 1.1 2003/10/12 19:41:18 mholzer Exp $
+  */
+ 
+ #include "config.h"
+@@ -112,7 +112,7 @@
+ 	{"Canon:PowerShot A20",		CANON_PS_A20,		0x04A9, 0x304E, CAP_SUP, S10M, S32K, NULL},
+ 	{"Canon:PowerShot A10",		CANON_PS_A10,		0x04A9, 0x304F, CAP_SUP, S10M, S32K, NULL},
+ 	/* Mac OS includes this as a valid ID; don't know which camera model --swestin */
+-	/*{"Canon:PowerShot ??",		CANON_PS_A10,		0x04A9, 0x3050, CAP_SUP, S10M, S32K, NULL},*/
++	{"Canon:PowerShot unknown 1",	CANON_PS_UNK1,		0x04A9, 0x3050, CAP_SUP, S10M, S32K, NULL},
+ 	/* Canon IXY DIGITAL 200 here? */
+ 	{"Canon:PowerShot S110",	CANON_PS_S100,		0x04A9, 0x3051, CAP_SUP, S10M, S32K, NULL},
+ 	{"Canon:DIGITAL IXUS v",	CANON_PS_S100,		0x04A9, 0x3052, CAP_SUP, S10M, S32K, NULL},
+@@ -122,7 +122,7 @@
+ 	{"Canon:PowerShot A40",		CANON_PS_A40,		0x04A9, 0x3058, CAP_SUP, S10M, S32K, NULL},
+ 	{"Canon:PowerShot A30",		CANON_PS_A30,		0x04A9,	0x3059, CAP_SUP, S10M, S32K, NULL},
+ 	/* 305c is in MacOS Info.plist, but I don't know what it is --swestin. */
+-	/*{"Canon:PowerShot ????",		CANON_PS_A30,		0x04A9,	0x305c, CAP_SUP, S10M, S32K, NULL},*/
++	{"Canon:PowerShot unknown 2",	CANON_PS_UNK2,		0x04A9,	0x305c, CAP_SUP, S10M, S32K, NULL},
+ 	{"Canon:EOS D60",		CANON_EOS_D60,		0x04A9, 0x3060, CAP_SUP, S10M, S32K, NULL},
+ 	{"Canon:PowerShot A100",	CANON_PS_A100,		0x04A9, 0x3061, CAP_SUP, S10M, S32K, NULL},
+ 	{"Canon:PowerShot A200",	CANON_PS_A200,		0x04A9, 0x3062, CAP_SUP, S10M, S32K, NULL},
+@@ -131,10 +131,9 @@
+ 	{"Canon:Digital IXUS v2",	CANON_PS_S200,		0x04A9, 0x3065, CAP_SUP, S10M, S32K, NULL},
+ 	{"Canon:Digital IXUS 330",	CANON_PS_S330,		0x04A9, 0x3066, CAP_SUP, S10M, S32K, NULL},
+ 	{"Canon:PowerShot S50 (normal mode)",	CANON_PS_S50,	0x04A9, 0x3077, CAP_SUP, S99M, S32K, NULL},
+-	{"Canon:PowerShot S45 (normal mode)",	CANON_PS_S45,	0x04A9, 0x306C, CAP_SUP, S99M, S32K, NULL},
+ 	/* 306a is in MacOS Info.plist, but I don't know what it is --swestin. */
+-	/*{"Canon:Digital ???",	CANON_PS_??,		0x04A9, 0x3066, CAP_SUP, S10M, S32K, NULL},*/
+-	{"Canon:PowerShot S45 (normal mode)",	CANON_PS_S45,	0x04A9, 0x306a, CAP_SUP, S99M, S32K, NULL},
++	{"Canon:Digital unknown 3",	CANON_PS_UNK3,		0x04A9, 0x306a, CAP_SUP, S10M, S32K, NULL},
++	{"Canon:PowerShot S45 (normal mode)",	CANON_PS_S45,	0x04A9, 0x306C, CAP_SUP, S99M, S32K, NULL},
+         /* 0x306D is S45 in PTP mode */
+ 	{"Canon:PowerShot G3 (normal mode)",	CANON_PS_G3,	0x04A9, 0x306E, CAP_SUP, S99M, S32K, NULL},
+         /* 0x306F is G3 in PTP mode */
+@@ -157,11 +156,16 @@
+ 	/* S400 product ID for PTP mode is 0x3075; there may be no
+ 	 * "Canon" mode, so it will be supported by the PTP driver,
+ 	 * not here. */
++
+ 	/* 3078 and 307a are in MacOS Info.plist, but I don't know
+ 	 * what they are --swestin. */
+-	/*{"Canon:PowerShot ?????",		CANON_PS_A60,		0x04A9, 0x3078, CAP_SUP, S10M, S32K, NULL},*/
+-	/*{"Canon:PowerShot ?????",		CANON_PS_A60,		0x04A9, 0x307a, CAP_SUP, S10M, S32K, NULL},*/
++	{"Canon:PowerShot unknown 4",		CANON_PS_UNK4,		0x04A9, 0x3078, CAP_SUP, S10M, S32K, NULL},
++	{"Canon:PowerShot unknown 5",		CANON_PS_UNK5,		0x04A9, 0x307a, CAP_SUP, S10M, S32K, NULL},
++
++	/* MV630i seems to be a DV camcorder */
++	{"Canon:MV630i",		CANON_MV630I,		0x04A9, 0x307b, CAP_SUP, S99M, S32K, NULL},
+ 	{"Canon:EOS 10D",		CANON_EOS_10D,		0x04A9, 0x3083, CAP_SUP, S10M, S32K, NULL},
++
+ 	/* Canon MVX2i in some mode is 0x3067 - probably PTP */
+ 	/* Apparently the MVX2i is the same as Optura 200 MC (Philippe
+ 	 * Gramoulle), so share the code. */
+diff -r -u libgphoto2-2.1.2.orig/camlibs/canon/canon.h libgphoto2-2.1.2/camlibs/canon/canon.h
+--- libgphoto2-2.1.2.orig/camlibs/canon/canon.h	2003-08-10 13:51:13.000000000 -0500
++++ libgphoto2-2.1.2/camlibs/canon/canon.h	2003-10-12 11:48:40.000000000 -0500
+@@ -3,7 +3,7 @@
+  *
+  * Written 1999 by Wolfgang G. Reissnegger and Werner Almesberger
+  *
+- * $Id: libgphoto2-2.1.2-canon.patch,v 1.1 2003/10/12 19:41:18 mholzer Exp $
++ * $Id: libgphoto2-2.1.2-canon.patch,v 1.1 2003/10/12 19:41:18 mholzer Exp $
+  *
+  */
+ 
+@@ -88,8 +88,14 @@
+  * @CANON_PS_G3: PowerShot G3
+  * @CANON_PS_S230: PowerShot S230, Digital IXUS v3
+  * @CANON_PS_A60: PowerShot A60
++ * @CANON_MV630I: MV630i camcorder
+  * @CANON_EOS_10D: EOS 10D
+  * @CANON_OPT_200: Optura 200 MC, MVX2i
++ * @CANON_PS_UNK1: Unknown camera seen in Mac OS X Image Capture
++ * @CANON_PS_UNK2: Unknown camera seen in Mac OS X Image Capture
++ * @CANON_PS_UNK3: Unknown camera seen in Mac OS X Image Capture
++ * @CANON_PS_UNK4: Unknown camera seen in Mac OS X Image Capture
++ * @CANON_PS_UNK5: Unknown camera seen in Mac OS X Image Capture
+  *
+  * Enumeration of all camera types currently supported.
+  *
+@@ -121,12 +127,19 @@
+ 	CANON_PS_A100,
+ 	CANON_PS_A200,
+ 	CANON_PS_A300,
++	CANON_PS_S50,
+ 	CANON_PS_S45,
+ 	CANON_PS_G3,
+-	CANON_PS_S50,
+ 	CANON_PS_S230,
++	CANON_MV630I,
+ 	CANON_EOS_10D,
+-	CANON_OPT_200
++	CANON_OPT_200,
++	/* In Mac OS Image Capture, but not yet seen in the wild. */
++	CANON_PS_UNK1,
++	CANON_PS_UNK2,
++	CANON_PS_UNK3,
++	CANON_PS_UNK4,
++	CANON_PS_UNK5
+ } canonCamModel;
+ 
+ /**
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
index 9ad21e284788..42ca21b5f717 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild,v 1.4 2003/10/08 21:29:42 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild,v 1.5 2003/10/12 19:41:18 mholzer Exp $
 
 inherit libtool
 
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-norpm.patch
+	epatch ${FILESDIR}/${P}-canon.patch #Closes #30880
 }
 
 src_compile() {