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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 31 insertions, 9 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/Manifest b/media-libs/libgphoto2/Manifest
index 72b8e2bf7993..174382be10b3 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -5,19 +5,20 @@ AUX libgphoto2-2.4.7-no-test-build.patch 910 SHA256 a5d7ab59c51bb9751ade66082844
 AUX libgphoto2-2.4.7-respect-bonjour.patch 643 SHA256 00b09825d9b6493a2a65577c6bf0b2a5549c6901b8b5fb839f886d989e29c055 SHA512 c6e07ffdfc8f81cee8624ce67df0480ca2fa98df1748906393ca196c73e11a482e62f59d1eb5bedc05ea3bb754ffdf4c23f4ed7f3a9d9264fbf81ed6554f4ead WHIRLPOOL 09a39eda0a3d40a8402b5483aa24d567b0da53926c7fcd85aebaca4a2510020fd8b273405d8407815f27ca1c57ab734565fe6b11fff158c9909391021c1008f2
 AUX libgphoto2-2.4.8-increase_max_entries.patch 477 SHA256 596ab7c4edc7573044e89ac548505b82de18f791616126273ff4fe13c935b4f8 SHA512 9a23b5b1787e1582a984dc096be3365c2a372ece8dfefa42d1ef05e5ce92ff26fc3562ff04da06766df69b0d587fdece5252c706abd4c57a556e6fb2257c8614 WHIRLPOOL b354a40426e6f731e57adf85ae11e1f9c87154dc48d6149e3e33887df60427e06bb907a8878d56427b7eb8211b7f5b1228b9d758ac4230fd47f214f82546d721
 AUX libgphoto2-2.4.9-dnl.patch 471 SHA256 6f657277d3262d8295b35d5bd49c79a229fef5a9b587191d9e1a91ed73564bf5 SHA512 85d6dd60c81f4b0c76894576483afa851fc3d4c7ff3644853a1db3147395ba5980b19dc4452094387a41fe26d3ab09a342f24acabcbf9d23e07c0f32e895327c WHIRLPOOL 168f23c3e2b720e2b4a1b9459ab5c10ace825d6f312a1bbcc93e139df0cb51759acaf3341d64cc51e39a4aecadbe5382f2f1b2f44a572ca8bea4e2c28a6e0ea2
+AUX libgphoto2-2.5.2-canon-s100.patch 1148 SHA256 8de2ca8a2cb6ceb3aea0588000a48e93d909578da277ed9633728bb16ed0f687 SHA512 07a6db0f29e42f89a8667f62098dd6702dc1f026f8842457fb44efa0e6377ccca120e4bcaabf2b841ed6bd193924704534a272fac58bd39c0397c4ae24d58716 WHIRLPOOL e5f6e3652181599dfd8e36c5e63222f02c08a06d84779906d6f621b818ce64fe32c14d301772a69a820730ebea8cfc595a3bb5a0cc5d5ec0b5975b0e93d105c8
 AUX libgphoto2-2.5.2-libxml2-detection.patch 1157 SHA256 cc99141f7467067325edeac8d14ec4a6c912817cdde181e078974e35435391a8 SHA512 bb874494a9b4718da96f9f5f9dc9a283623d0cb85c33fc23ce75c4739a23a6afc46f5ca3d6ca65afc17ef1f0d80631307f8b3fea56052ceb9103e052de850061 WHIRLPOOL 06bc555f7b1c56ed5cc8db1f25fcd682c49f5b64fe908de16fd30aeb469a414c62c4ca60c003cd44338ef31fc0e2dac3f5a6a58b600c32d51ec93093de4c7a2d
 AUX libgphoto2-2.5.2-libxml2-detection2.patch 579 SHA256 1f8270cd93e43cb5c55b6ba335a5b4d5f6ce3aad5d079e10001e727231322d03 SHA512 f1afb74da896def6ba16630bef187be405ebc91e87964bdd542632ef5a25afd7f2f2c9ee30914f0b811b74db7b29afaee23ed23d19ab4ee54d35d1bf6dfef50f WHIRLPOOL 6db454ffea7c4c7cab28b6a642f0b3188c18cab821fb867d5ff9b149d9145c04289e81a76cae5882fd2c3d532819c8e70747cb7479ee0a3197708cbb3022453f
 DIST libgphoto2-2.4.14.tar.bz2 4481384 SHA256 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292 SHA512 4abc89ee2d714deab98cdba84d0497b7262105ade3b3c43eaa8936b6e5359a8dc50c49c217fff37f013e0ce7404b82b4c7c2f90af49274a3ecb9f15e10747a73 WHIRLPOOL 0b9674c93f62cd060fc2134816b8dfd809e9276b8ffd943b9856ca57fac319dc4201aeab71a267a1d547bfcc7c4e80cd97d8a9d37528e16703adb57084630faf
 DIST libgphoto2-2.5.2.tar.bz2 6446235 SHA256 a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838 SHA512 f572fc6bdcb6a6363ad3ad7ac86fdd401c1d86ce82497d36c2b3c6ca6242b880e72246d8fe3e9624ecb813b3c0b123bd14adf2d1bf69a2bee3a0e837b0a4a527 WHIRLPOOL 23db9e272f3d6038c1c7eb019996eceb67a1afbbda54d7101bcc3ccb44d3bebccdd836430aac5d6c7757f55fb544256ee3cf029304b9a9a493832b0fe11979a8
 EBUILD libgphoto2-2.4.14-r1.ebuild 6232 SHA256 bcc43b9153506a6ec3f11dc61fd995c8e19a0c4cd743d2163ea99610c6faa7bc SHA512 c2d49f6143076ce6acc3ddeca0acbc5af0f436f0dc5ca410f68d75f9739557ac718eb9b88beff384139c9da94f12ef34f7875490eb5ceab7f852cf232837f074 WHIRLPOOL c8d843b8ad3f7cd0d54e6f10357f578801eb2145a746b72847cd062370e4c9dd30011bd813a952b3d13af2afe1b5b2d60a9383f05513a5cae38cd2512245f832
 EBUILD libgphoto2-2.5.2-r1.ebuild 6467 SHA256 0502e6d3742fdca1d2c02ff97865f8b512a55dd8edb0a8aff7e01af2bce7f5a2 SHA512 8c642667365070669637bf7eeb9fc85be725e88fcd35056ac2c0babaa623bf5416bac0fead6b461d96bbd2c5f6baa3171032aa984480d47ffcf6babecf11cd23 WHIRLPOOL 5dfe39aa8b25cff855f1e7b57d9a9b788b4394fbaaa888782b937e9c08c265a7093dfe01c6e81d29908798ae60107347028d20a43069b28e241be564b31c2cb4
-EBUILD libgphoto2-2.5.2-r2.ebuild 6663 SHA256 4fef4742ec61aa063d658d5f68cfda90c94f1b14b1110acae2c52d254349bef4 SHA512 0eb89379d5953fd72f21694a047fdfa98b9d064ef24b84a0febf6cbc2544abdaf3b7ab93eb24f3d6965ce9d42ee898ef20be1eea0d69c4cb111807d254453852 WHIRLPOOL 9d837e60008b87497b68135b9f541dcb0fdd588d5b434ca87cda65ddf5551b5da24c963bfbd9e25e67c1b27891876f9cace5229fc85d86b0e4a31d63d8d7be4e
-MISC ChangeLog 39156 SHA256 a1a97cad62a288a03f053c132d18af58c3c0fb3abff7e07d247143763368fe41 SHA512 fa076179e0278e0942090803d4386834a0cd214e48061b06eb5242dd84c5b76b1ea75d73758201c053e81de363fb8f9ec59bcc47cad5fb0d70907782ad912c4f WHIRLPOOL e42cb578b289a66319e5d8fa1687a1b5ca01017f70032e8a773ef924fcc903a6df267e2c24ddc18a53954f83def43ea912f7883585c08accef8782b971589406
+EBUILD libgphoto2-2.5.2-r3.ebuild 6768 SHA256 e8f0157204309f58cb3b7acd6c449e7a2c8f58a2850a8be02158621f712dd019 SHA512 d02c26d05b7f8d67882de4a0afacfbe4552f09076c1648981ab770f14c0175d34b069364512e12c4a19043b0729e54bcfd81caee86850753b96bf9842d82a059 WHIRLPOOL 9836bc5b119a657b65644b0c6febe5d061cb45bf6404f358e6e1a506bcb461b12c84747b4f30a4a8ed7077c776d60d1faf28759f798b8ef098de9523604b0de4
+MISC ChangeLog 39415 SHA256 8c7db21edcf31d6ac55e859abd7eb6b7389220d1dfcdc45110654f4547231346 SHA512 4553f0cafd03db5ddb93d5513d1f66689eb645d2390f5bb3dff674176a611061ab1a73b829559eaf16915c63dbfb11329adec349b774d0646c00a3a77b4331ff WHIRLPOOL 1ab176c5d65941fcd545870ddf155b5d1aacd4e0770e2a5b91cb03ec1b1106e226952f79b8624d7c3357de45f99720baaac24bd127665101f006fa8d2c8659cb
 MISC metadata.xml 253 SHA256 d588fba550907efea387719a7a12f54e6c0ec2ca03864f9f5cf828d26fdd0e4a SHA512 810bb24e1fadd707df227dc11b1a04f25e102364dc8a709e0a082a539081afef56beb2618e2e38ed5d0c7f34c8bda966035c6ad25598ced1ddd5202260cc8079 WHIRLPOOL 0773381f0be58cda0a2ecdca7cb89638cce7b1dc774e2c13500ff43d42f8c8c771e00cc91433ddc7e1213be6267f3ad02981dd20e11590371935d02a49247b2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK3DqMACgkQVWmRsqeSphM3GACZAZdwoiy7C9IkJ9rOLwNgsH2l
-syQAn1vZw37i0k/qdvpcbI6gaWqVK+pW
-=Cnnq
+iEYEAREIAAYFAlLGl4gACgkQCaWpQKGI+9QBXwCfRw9mwWviFEvcnhHGqKwiZ4mp
+mQUAn2hP6eoHOAcfIAiSC4Breoh7EmgA
+=EFfa
 -----END PGP SIGNATURE-----
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
 }