Fix Canon S100 detection, bug #496754 by Nikolay Kichukov, drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 25 insertions, 4 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 4becb2a394e2..7156bd4dd735 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libgphoto2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.244 2013/12/22 16:09:05 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.245 2014/01/03 10:57:11 pacho Exp $
+
+*libgphoto2-2.5.2-r3 (03 Jan 2014)
+
+  03 Jan 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/libgphoto2-2.5.2-canon-s100.patch, +libgphoto2-2.5.2-r3.ebuild,
+  -libgphoto2-2.5.2-r2.ebuild:
+  Fix Canon S100 detection, bug #496754 by Nikolay Kichukov, drop old
 
   22 Dec 2013; Jeroen Roovers <jer@gentoo.org> libgphoto2-2.5.2-r1.ebuild:
   Stable for HPPA (bug #478252).
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.2-canon-s100.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.2-canon-s100.patch
new file mode 100644
index 000000000000..3e83213f2b3f
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.5.2-canon-s100.patch
@@ -0,0 +1,11 @@
+--- libgphoto2-2.5.2.orig/camlibs/canon/canon.c

++++ libgphoto2-2.5.2/camlibs/canon/canon.c

+@@ -125,7 +125,7 @@ const struct canonCamModelData models[]

+         /* 3042 is a scanner, so it will never be added here. */

+         {"Canon:PowerShot S20",         CANON_CLASS_0,  0x04A9, 0x3043, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot S20"},

+         {"Canon:EOS D30",               CANON_CLASS_4,  0x04A9, 0x3044, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

+-        {"Canon:PowerShot S100",        CANON_CLASS_0,  0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

++        {"Canon:PowerShot S100 (2000)", CANON_CLASS_0,  0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

+         {"Canon:IXY DIGITAL",           CANON_CLASS_0,  0x04A9, 0x3046, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

+         {"Canon:Digital IXUS",          CANON_CLASS_0,  0x04A9, 0x3047, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

+         {"Canon:PowerShot G1",          CANON_CLASS_0,  0x04A9, 0x3048, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot G1"},
\ No newline at end of file
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.2-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.2-r3.ebuild
index d933d224cd0a..9b8ab81b88e7 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.2-r2.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2-r2.ebuild,v 1.2 2013/12/05 13:38:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2-r3.ebuild,v 1.1 2014/01/03 10:57:11 pacho Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -105,6 +105,9 @@ src_prepare() {
 	# Fix libxml2 detection, bug #491782
 	epatch "${FILESDIR}"/${PN}-2.5.2-libxml2-detection{,2}.patch
 
+	# Fix Canon S100 detection, bug #496754 (fixed in 2.5.3)
+	epatch "${FILESDIR}"/${P}-canon-s100.patch
+
 	eautoreconf
 }