Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2/files: libgphoto2-2.5.2-canon-s100.patch
Date: Fri, 03 Jan 2014 10:57:16
Message-Id: 20140103105711.6A6732004C@flycatcher.gentoo.org
1 pacho 14/01/03 10:57:11
2
3 Added: libgphoto2-2.5.2-canon-s100.patch
4 Log:
5 Fix Canon S100 detection, bug #496754 by Nikolay Kichukov, drop old
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
8
9 Revision Changes Path
10 1.1 media-libs/libgphoto2/files/libgphoto2-2.5.2-canon-s100.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.5.2-canon-s100.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.5.2-canon-s100.patch?rev=1.1&content-type=text/plain
14
15 Index: libgphoto2-2.5.2-canon-s100.patch
16 ===================================================================
17 --- libgphoto2-2.5.2.orig/camlibs/canon/canon.c
18 +++ libgphoto2-2.5.2/camlibs/canon/canon.c
19 @@ -125,7 +125,7 @@ const struct canonCamModelData models[]
20 /* 3042 is a scanner, so it will never be added here. */
21 {"Canon:PowerShot S20", CANON_CLASS_0, 0x04A9, 0x3043, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot S20"},
22 {"Canon:EOS D30", CANON_CLASS_4, 0x04A9, 0x3044, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},
23 - {"Canon:PowerShot S100", CANON_CLASS_0, 0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},
24 + {"Canon:PowerShot S100 (2000)", CANON_CLASS_0, 0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},
25 {"Canon:IXY DIGITAL", CANON_CLASS_0, 0x04A9, 0x3046, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},
26 {"Canon:Digital IXUS", CANON_CLASS_0, 0x04A9, 0x3047, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},
27 {"Canon:PowerShot G1", CANON_CLASS_0, 0x04A9, 0x3048, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot G1"},