From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 72F901381F3 for ; Tue, 1 Oct 2013 19:03:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA9E8E0B34; Tue, 1 Oct 2013 19:03:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4627BE0B34 for ; Tue, 1 Oct 2013 19:03:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2CF4C33E874 for ; Tue, 1 Oct 2013 19:03:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B8A70E5308 for ; Tue, 1 Oct 2013 19:03:02 +0000 (UTC) From: "Markus Meier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markus Meier" Message-ID: <1380458772.47b339c155befe1029f262e7b2a495a0bb5c55f8.maekke@gentoo> Subject: [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/ X-VCS-Repository: dev/maekke X-VCS-Files: media-libs/lensfun/ChangeLog media-libs/lensfun/Manifest media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch media-libs/lensfun/files/lensfun-0.2.7-build.patch media-libs/lensfun/files/lensfun-0.2.7-memset.patch media-libs/lensfun/lensfun-0.2.5-r2.ebuild media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild media-libs/lensfun/lensfun-0.2.6.ebuild media-libs/lensfun/lensfun-0.2.7.ebuild X-VCS-Directories: media-libs/lensfun/files/ media-libs/lensfun/ X-VCS-Committer: maekke X-VCS-Committer-Name: Markus Meier X-VCS-Revision: 47b339c155befe1029f262e7b2a495a0bb5c55f8 X-VCS-Branch: master Date: Tue, 1 Oct 2013 19:03:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8f47b79a-0767-4711-8f04-06bb4972c219 X-Archives-Hash: 925ba6959a3110666fb49181d2be0736 commit: 47b339c155befe1029f262e7b2a495a0bb5c55f8 Author: Markus Meier gentoo org> AuthorDate: Sun Sep 29 12:46:12 2013 +0000 Commit: Markus Meier gentoo org> CommitDate: Sun Sep 29 12:46:12 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=47b339c1 sync with gentoo-x86 Package-Manager: portage-2.2.7 Manifest-Sign-Key: 072AD062 --- media-libs/lensfun/ChangeLog | 35 ++++++++++-- media-libs/lensfun/Manifest | 39 ++++++++------ .../lensfun/files/lensfun-0.2.5_p153-build.patch | 12 ++--- .../lensfun/files/lensfun-0.2.5_p153-pc.patch | 6 +-- .../lensfun/files/lensfun-0.2.6-auxfun.patch | 11 ++++ ..._p153-build.patch => lensfun-0.2.7-build.patch} | 63 ++++++++++------------ .../lensfun/files/lensfun-0.2.7-memset.patch | 13 +++++ media-libs/lensfun/lensfun-0.2.5-r2.ebuild | 6 +-- media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild | 6 +-- media-libs/lensfun/lensfun-0.2.6.ebuild | 43 +++++++++------ media-libs/lensfun/lensfun-0.2.7.ebuild | 47 ++++++++++++++++ 11 files changed, 196 insertions(+), 85 deletions(-) diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog index 5b7a77f..2ceed54 100644 --- a/media-libs/lensfun/ChangeLog +++ b/media-libs/lensfun/ChangeLog @@ -1,6 +1,36 @@ # ChangeLog for media-libs/lensfun -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.43 2012/05/29 16:39:52 aballier Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.50 2013/04/06 10:08:14 ssuominen Exp $ + + 06 Apr 2013; Samuli Suominen lensfun-0.2.7.ebuild, + +files/lensfun-0.2.7-memset.patch: + Include for memset() because it's no longer implicitly pulled in + by libpng since 1.6.0. Use subslotting for libpng and zlib dependencies. + + 23 Mar 2013; Markus Meier lensfun-0.2.7.ebuild: + restore python-2.7 support + +*lensfun-0.2.7 (23 Mar 2013) + + 23 Mar 2013; Markus Meier +lensfun-0.2.7.ebuild, + +files/lensfun-0.2.7-build.patch: + version bump by Mario Kicherer in bug #456990 + + 03 Mar 2013; Mike Frysinger lensfun-0.2.5-r2.ebuild, + lensfun-0.2.5_p153-r1.ebuild, lensfun-0.2.6.ebuild: + Add s390 lovin. + + 07 Feb 2013; Ulrich Müller lensfun-0.2.6.ebuild: + Move Creative Commons licenses to shorter names. + + 21 Sep 2012; Christoph Junghans lensfun-0.2.6.ebuild: + added prefix support (bug #425342) + +*lensfun-0.2.6 (02 Jul 2012) + + 02 Jul 2012; Samuli Suominen +lensfun-0.2.6.ebuild, + +files/lensfun-0.2.6-auxfun.patch: + Version bump. 29 May 2012; Alexis Ballier lensfun-0.2.5_p153-r1.ebuild: @@ -155,4 +185,3 @@ 01 Jun 2009; Markus Meier +lensfun-0.2.3.ebuild, +files/lensfun-0.2.3-as-needed.patch, +metadata.xml: initial import of lensfun, ebuild by me, bug #245770 - diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest index 060ca2c..6f4c943 100644 --- a/media-libs/lensfun/Manifest +++ b/media-libs/lensfun/Manifest @@ -1,21 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX lensfun-0.2.5-libpng15.patch 1254 RMD160 72f6eb784255d2e419368a40496150b64699d11d SHA1 3bf2041a49369a6a6af4a3da4aac8fead139e9da SHA256 19f533bf5c3a1172c7f5ae0b849579c72d3968500cc84de41bc5a13ef2f1e367 -AUX lensfun-0.2.5_p153-build.patch 2296 RMD160 540b9ec1bbd86cfe4792247d76b4093c31e7cfd3 SHA1 d13f9fd7caa2f1fd1f5a67a7190fd47679c5218a SHA256 e5f623ed7edc5d3f6c0f53a710a9d4eb757d9b84795558a13e667f2dde3c1d4f -AUX lensfun-0.2.5_p153-pc.patch 783 RMD160 ecd426ffcfb209a04f904c81fee317fe3090ef17 SHA1 423205eb8da0f7855946f4d18e9c51fd3a5c17f5 SHA256 95bbac238875bcd198c0f91ab502fc991b5dd5649a943f0a46beee0a2cba5d45 -DIST lensfun-0.2.5.tar.bz2 470733 RMD160 2f421cefb65d271b937e3d61f41f8536fd078971 SHA1 7e8568cb131b6e2090264274483721a959f6b9bc SHA256 c21498eb1889714af25e4e08474d9faa1e45132c89a8c1ac97340233e988fb87 -DIST lensfun-0.2.5_p153.tar.xz 466656 RMD160 8367b7cb8cd2927e348a87c32ecf010e9650351c SHA1 e50b000b02e74db42f2dfa95ab26a97cfc005f2b SHA256 7677d2cf217ab71985eba82889886784a3466c4435a98b6a996580bc166876ff -DIST lensfun-0.2.6.tar.bz2 505690 RMD160 03d3513ae2d66464313eb6f0587e8ec8a1c33387 SHA1 0d7ffbae5c54159308114f69a9e2bc5f4d24d836 SHA256 eebf35851f6d40ecf007578b859f9ecb66af417c1895d1fc0c5776d5d9bdb26e -EBUILD lensfun-0.2.5-r2.ebuild 1436 RMD160 f24acb1df676931426f58fc3c2e2873f89b8bb0d SHA1 9589d149297df53351d0b3cec5098ae7f28c66b7 SHA256 deaac90cd89871e460f0d3445cb3a38266cc689461985449120a973066177c4d -EBUILD lensfun-0.2.5_p153-r1.ebuild 983 RMD160 44bd4e74e6b152660ab4983e1a4043c13903d202 SHA1 b0ec45f7968e8549b4c8ee07d1fd7280394870df SHA256 05af7bcc908e07ce8482923817c720b5b425da9612bed1be0a1346e936f4a878 -EBUILD lensfun-0.2.6.ebuild 988 RMD160 55e66994478fe0966b7ef5b5ee025f2ea50db7a6 SHA1 4787c65efee6bfbfb80afcb4fd310238dfed9921 SHA256 bd46bc32183a297a93c8dcadc1846138429ef02e0a92f4dc7de22580bb2bcd70 -MISC ChangeLog 5614 RMD160 2fbd00e980e6b0b2789bee7f5e8e432fa05f6cea SHA1 aa58f2ca5bf0918d5de8d4fdbd129081664318c6 SHA256 ad2a3517dd9f0df920fd77cbb2483cdfba9d473e9545dc0aadf7875c376aaaa3 -MISC metadata.xml 434 RMD160 50bd60c8f0e7c9da3ca52b50b8b4705c9c0bb219 SHA1 a57ff3680e403b95d6f19138167a103cea711987 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f +AUX lensfun-0.2.5-libpng15.patch 1254 SHA256 19f533bf5c3a1172c7f5ae0b849579c72d3968500cc84de41bc5a13ef2f1e367 SHA512 6189e3b566cdf01e4bd69df7cc64881c1fc3610210b8fe32a7c905138b132d3822dbcc4d504276e7411dfc2fe2cf0d257d76ccbab1395eda1c008ef262ff372f WHIRLPOOL cab5294c0516ee9486c372cce72e3d6d55904a5cca9fe9bcfe138f1122f986b2743e3365d5c8ba691b5ff06742a918fb54a7ef40c636211b280a91586b0a5095 +AUX lensfun-0.2.5_p153-build.patch 2051 SHA256 7f944fc1606af58757d64d40776d9636ba43c1ef8db1aca0f20b1d88a30bc80a SHA512 1a252374e21a8943460bde7726e764823c5e94eddcd8cbbbcc441436109b95577f5af154aa3d2e746054efc1e5d110822417728601f60e5b79275764e1d56b43 WHIRLPOOL 21c45eb7a4025b02d90561cf6dd6147a56bccfc09091d014cd80c2ba44ad2e3c752f72cdcd42421ecd444a41cef563a717e516ffe05083fae85786b886f3dcff +AUX lensfun-0.2.5_p153-pc.patch 650 SHA256 ab4ff4243ce94db8df5ed737292fd9d805e932ec8d9569bb480fb8262addc9d9 SHA512 e51dd5ee8aabdd5ed9ac5aa36fbccd38c71e0aae4625b3529064b18ebb5f1e1321f4d336850938e99b5f6792ca254cef87c71a74be4128ab2ae041e6fe1a0ba1 WHIRLPOOL d8141d3cecb0cbfe082ea47319f1952c6830777ec4ed3cd5816c796a9548db71497677b7cdd67d09b1df0b681bc29ec85ab0b13d0a02db6aa40f10265f4c6cb1 +AUX lensfun-0.2.6-auxfun.patch 500 SHA256 173cd284ba1b4ba61137e09327fae25725f89290bb32c553bf5c48c3534f14ef SHA512 c9ae1b4eaeba1eb0ef822767532f07a819ce2237da1d273804d6a9837a368d53b231edd936d7c715a4b173a5f7e2ab3b5439a8bb94aae8c775f8729e5b296e56 WHIRLPOOL c933a2665188ca846e01642a8e236100aca333c9e32c7296a8aff4efd25ef12be03de5f78a1e7800feafdd9b74fdb4670e3bcc651f39966af1b97cef91e8cd44 +AUX lensfun-0.2.7-build.patch 2425 SHA256 9678f9fdc90e2930913eb386b8e0d5809c06dab389b95fd65261e431557c9202 SHA512 f4fa88816e0ac4f52c0f927bd5cfec93e3a97aab395c12aa38cc2e6cf1156c9d7e59ac145310e1e0c3b40180cfee30cff4a6ef5ab46df2ff076337aaeb01a26e WHIRLPOOL 2829c6c9ab752ab90f0f04f8d9aeadc106f71cb752daad6d540a33c60dea7ea9fc3f3af13d02e2685fb139b7361dcd804062aad2f7d43f45983c52d1fae431fa +AUX lensfun-0.2.7-memset.patch 377 SHA256 4d893f17f65d919f14d16b46e7c0d51e31cce8149da4a60755d0e75b8d141cc6 SHA512 92936cbc414b7f0f00bc0060a1c6c2c701c1f7c649039c81155626db16aa701286b33017121be5b7d853207b3d28a05f1d5b1cf48f1d58b6934f615f9ee366ff WHIRLPOOL 222a8ce4913a1668fabbb40ea288a72270ddf75839d611e33495d47d99814e701c112d96d9c0fba9c7d2de3e62a180cd075291cc8eb40f5a7ba920d0b3bed136 +DIST lensfun-0.2.5.tar.bz2 470733 SHA256 c21498eb1889714af25e4e08474d9faa1e45132c89a8c1ac97340233e988fb87 SHA512 a90292fd53fc12d82ccfd0211b8e544b18e2bd712010bf4c1cad5ad1d18f82145c399371f3699fe004571a845420f8e17f3237b45f861cb58c7ac8df8e503baa WHIRLPOOL 6e85477234988e1a060eb97810ad856360ee81eea15978ac7d9fd93a864ece5a6b3b64f81fa506a50c999ae281a283a269fa59ffb854089ad638ce6d3ce8cbed +DIST lensfun-0.2.5_p153.tar.xz 466656 SHA256 7677d2cf217ab71985eba82889886784a3466c4435a98b6a996580bc166876ff SHA512 7263ea69d89e710f84e6f1c3c9287f8f54efe3823fd9babe2c3e191c38a8e17664ed3e330771f2c2579c65cbadb56eaa277362860ee39549238d0926a8d9d23d WHIRLPOOL 86f8e0f4f4a43c41d5965aeb9941d1e8b1068dd3a182c9954b4a0600600dcc55a4eef1049d9e19aa5a3e5d0e02201325774cbb5cc47cecd88b2608069a257c96 +DIST lensfun-0.2.6.tar.bz2 505690 SHA256 eebf35851f6d40ecf007578b859f9ecb66af417c1895d1fc0c5776d5d9bdb26e SHA512 209ef807d0cc43dcc021709ab0f5e460fed9192a4f617c8e4e07fd6e3b0ad3863d1e1b716c38025ec5cc8b22f62708ec64b4e02f14b35f25c5767b5db1defbb1 WHIRLPOOL 198a2834d6966c83fdd293b52a3a3b289c932989b123484394dddd9550c9a6ac41d14017894e1288debe2865d5f3bafb34f714040a3523b76335c563bad6ae47 +DIST lensfun-0.2.7.tar.bz2 552960 SHA256 3ddf0747bd6af1ec7d722f8c45dafdd8adfb96c081492b216c14d89f82806477 SHA512 0df48ef824bd562065cc1eaf611870ab526cd64a32f99947f1f1c0c633280f4fc2f248d38da65dc0627d399085da4c35c938a42a64753976c8dfb5fbd97c96f2 WHIRLPOOL 039f93f4a8dcd6d3ec88ad453151346ba6c92b3d36130c406c9aed7cbfad9c2a2bdfcfe866df5070026042f3980ed345604bda0d8faf4130f078d26da9032dc8 +EBUILD lensfun-0.2.5-r2.ebuild 1441 SHA256 33062b3bdffdb3397cd73d6c2409d7f263e7d8ee46949886ee535f38eb5a95b1 SHA512 fd98095a404b7144515dbb9f119d29e426607ae9905daf0d7a69047b99a238bcd20584de38128313444bfef538f0b84034e8d9c36abfadb769f9264fcfa19d97 WHIRLPOOL f45ae814163a54a994868b3051be0a33a59a1248bda0f3440febff38f4c51e3b6cf9a5b0fd8b6674c9d516233f95a0cb6e5769c086464f4c605c3411f3ecef9e +EBUILD lensfun-0.2.5_p153-r1.ebuild 987 SHA256 b3709a3ecdf9aa08f7feae60c62f57025e0721a83f048c9117be946273e7c93e SHA512 4f0c9c9222d2a76b0d2f81e9dfe3fb5109ab2e8d51badc3f0f68c0b971d5f61cf09e930346740f1d44623b10168d4df1099dd052329062adb28edf30c57326ec WHIRLPOOL 1d855e9fb5369557e0bc3b70c52e628cade1c4463260edb14b89e5bb86013f0a20fd110be2f87c898a59d0735695ad3392e3c5ad5664fb89fa8dc9e950a97b9f +EBUILD lensfun-0.2.6.ebuild 1330 SHA256 8a514917ef1757f4f445eb1d4266a67f9451763aa65be743068bdafedc0d3434 SHA512 39c15eaeb4216bf7c775c3cb79b2980c176d608cd16675790a9b98458b8b9728419bc06d0bb7c8d8cd777e8dfc1d335e6cc812bfedbb0a5c33012c58e86dcfe0 WHIRLPOOL 85cee200a8a91cac828d565fb3596bd27d4009089e6bcc7d4678173a05690a78a81d5a99e928138730631f08703b943dd5461d9a70584265e81a01b4ab7983a6 +EBUILD lensfun-0.2.7.ebuild 1279 SHA256 5ccbe54b95c4904fe2f8610a4f023390b4efa69f035e3e1c85ad6143512e6d4c SHA512 c9e2dcafcfd182782784d749bd464638cb69b3fcc875d6ab3152e8223b7421e7c54181bf851f1468135976d7c7a73a77171b837c4d670636be5a5ebc32cc0eea WHIRLPOOL 04733fff4c3f6aa6508df0cf890a98015b73986012aa0f603a291b643e9df4558819b9e4125bb8112866ed52424cc9e89b215f59fbff5ddf0df71c4d2b61856f +MISC ChangeLog 6711 SHA256 7a28ab3cb2f240797547aabbd02ac417f4057ac49672472a0f99ff6f8baa4f4e SHA512 7faa1c4a3c32a333cb0c4d7a3da33f98f861e688a95add0725f38470f7a675917b329f2e3e84988be6be38b82dad898fb43fee5ce018240df3d2cb0f86ab66da WHIRLPOOL bb304aab5b2f08f7276b9ea79f87fdd1bfb43adf91052b3382bc58b5c850d6538639b564176e64a630b5d97889cd753dae4800f9767d019ffe3d34b13591745d +MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f SHA512 3735e2c7fd32e4b2309ebbfb2f8e3107698a5d722fbbb712bddda7dc665af5d994e8f213c06e247ff0fa04f09f209be2cd4fdac4ef218c5b60c99a65334944bf WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk/qMRoACgkQkKaRLQcq0GLxvwCfR89jb904WCjdUmi5vHgJBXlx -UtQAnA70cQkQKE4Bd3el1k4NKZy+8UW6 -=x1Ox +iQEcBAEBCAAGBQJRX/PwAAoJEEdUh39IaPFNqxUH/0KNmU5O+3uCBm+o6AWI39Dx +p3JlXO9PPcn9tg8VGPzdPRjOPdgoAseCcUQAAGI/BHg4/als+Q+EvjDF6rzuXu0T +Mt13ik5zkyfcHDoK9X32u3Bty+RcwsUeww0vYUAUkWauoqnZa4uzuEad3LL5ZxVi ++P6FeBYGklD83sfdChYr8tP7qU/VJIMAwQPFlyJHOL3+dtWbpo5FKdeD1UzOuxtV +OAjY6Gyk6kPVtQYKeuBUjajF7jSB6dzK1y0eMSfn7k/1YdUPszgtJhvpHc2VoUgY +iwS2OzjiEra4/9kDme8XTq5/ue0N15bSBmWqh29j7ykauPGhbqOVyodM4hZTuzg= +=aQse -----END PGP SIGNATURE----- diff --git a/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch b/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch index d204bc6..425031d 100644 --- a/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch +++ b/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch @@ -1,7 +1,5 @@ -Index: docs/CMakeLists.txt -=================================================================== ---- docs/CMakeLists.txt (Revision 153) -+++ docs/CMakeLists.txt (Arbeitskopie) +--- docs/CMakeLists.txt ++++ docs/CMakeLists.txt @@ -11,7 +11,7 @@ CONFIGURE_FILE(doxyfile.in.cmake ${DOXYFILE} @ONLY) @@ -18,10 +16,8 @@ Index: docs/CMakeLists.txt -FILE(GLOB doc_files "${CMAKE_DOC_OUT}/*.*") -INSTALL(FILES ${doc_files} DESTINATION ${DOCDIR}) +INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR}) -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (Revision 153) -+++ CMakeLists.txt (Arbeitskopie) +--- CMakeLists.txt ++++ CMakeLists.txt @@ -30,7 +30,7 @@ # options controlling the build process diff --git a/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch b/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch index a74acf8..a68cf55 100644 --- a/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch +++ b/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch @@ -1,7 +1,5 @@ -Index: libs/lensfun/CMakeLists.txt -=================================================================== ---- libs/lensfun/CMakeLists.txt (Revision 158) -+++ libs/lensfun/CMakeLists.txt (Arbeitskopie) +--- libs/lensfun/CMakeLists.txt ++++ libs/lensfun/CMakeLists.txt @@ -26,3 +26,12 @@ RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR} diff --git a/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch b/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch new file mode 100644 index 0000000..c8d989f --- /dev/null +++ b/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch @@ -0,0 +1,11 @@ +--- libs/auxfun/CMakeLists.txt ++++ libs/auxfun/CMakeLists.txt +@@ -6,7 +6,7 @@ + ADD_LIBRARY(auxfun SHARED ${AUXFUN_SRC}) + ENDIF() + +-SET_TARGET_PROPERTIES(auxfun PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}).${VERSION_MICRO}.${VERSION_BUGFIX}") ++SET_TARGET_PROPERTIES(auxfun PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}") + TARGET_LINK_LIBRARIES(auxfun ${PNG_LIBRARY} ${ZLIB_LIBRARY}) + INSTALL(TARGETS auxfun + RUNTIME DESTINATION ${BINDIR} diff --git a/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch b/media-libs/lensfun/files/lensfun-0.2.7-build.patch similarity index 73% copy from media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch copy to media-libs/lensfun/files/lensfun-0.2.7-build.patch index d204bc6..ebf557c 100644 --- a/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch +++ b/media-libs/lensfun/files/lensfun-0.2.7-build.patch @@ -1,27 +1,6 @@ -Index: docs/CMakeLists.txt -=================================================================== ---- docs/CMakeLists.txt (Revision 153) -+++ docs/CMakeLists.txt (Arbeitskopie) -@@ -11,7 +11,7 @@ - CONFIGURE_FILE(doxyfile.in.cmake ${DOXYFILE} @ONLY) - - # now build documentation --ADD_CUSTOM_TARGET(doc -+ADD_CUSTOM_TARGET(doc ALL - COMMAND "${DOXYGEN_EXECUTABLE}" - DEPENDS doxyfile.in.cmake manual-main.txt ../include/lensfun/lensfun.h.in - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" -@@ -19,5 +19,4 @@ - ) - - # install documentation --FILE(GLOB doc_files "${CMAKE_DOC_OUT}/*.*") --INSTALL(FILES ${doc_files} DESTINATION ${DOCDIR}) -+INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR}) -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (Revision 153) -+++ CMakeLists.txt (Arbeitskopie) +diff -ru lensfun-0.2.7.orig/CMakeLists.txt lensfun-0.2.7/CMakeLists.txt +--- lensfun-0.2.7.orig/CMakeLists.txt 2013-03-23 17:54:00.000000000 +0100 ++++ lensfun-0.2.7/CMakeLists.txt 2013-03-23 17:54:03.000000000 +0100 @@ -30,7 +30,7 @@ # options controlling the build process @@ -31,24 +10,20 @@ Index: CMakeLists.txt OPTION(BUILD_AUXFUN "Build auxfun library (requires libpng)" OFF) OPTION(BUILD_FOR_SSE "Build with support for SSE" OFF) OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" OFF) -@@ -71,13 +71,13 @@ - IF(BUILD_STATIC) - ADD_DEFINITIONS(-DCONF_LENSFUN_STATIC) - ENDIF() -- -+ +@@ -74,10 +74,10 @@ + # define destination dirs (relative to prefix) SET(BINDIR bin) --SET(LIBDIR lib) -+# SET(LIBDIR lib) +-SET(LIBDIR lib${LIB_SUFFIX}) ++# SET(LIBDIR lib${LIB_SUFFIX}) SET(INCLUDEDIR include) SET(DATADIR share/lensfun) -SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}) +# SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}) IF(WIN32) - SET(PLATFORM_WINDOWS 1) -@@ -125,12 +125,12 @@ + # install into place in build-dir +@@ -131,12 +131,12 @@ ENDIF() # install include files @@ -63,3 +38,23 @@ Index: CMakeLists.txt ENDIF() # install db files +Only in lensfun-0.2.7: CMakeLists.txt.orig +diff -ru lensfun-0.2.7.orig/docs/CMakeLists.txt lensfun-0.2.7/docs/CMakeLists.txt +--- lensfun-0.2.7.orig/docs/CMakeLists.txt 2013-03-23 17:54:00.000000000 +0100 ++++ lensfun-0.2.7/docs/CMakeLists.txt 2013-03-23 17:54:03.000000000 +0100 +@@ -11,7 +11,7 @@ + CONFIGURE_FILE(doxyfile.in.cmake ${DOXYFILE} @ONLY) + + # now build documentation +-ADD_CUSTOM_TARGET(doc ++ADD_CUSTOM_TARGET(doc ALL + COMMAND "${DOXYGEN_EXECUTABLE}" + DEPENDS doxyfile.in.cmake manual-main.txt ../include/lensfun/lensfun.h.in + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" +@@ -19,5 +19,4 @@ + ) + + # install documentation +-FILE(GLOB doc_files "${CMAKE_DOC_OUT}/*.*") +-INSTALL(FILES ${doc_files} DESTINATION ${DOCDIR}) ++INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR}) diff --git a/media-libs/lensfun/files/lensfun-0.2.7-memset.patch b/media-libs/lensfun/files/lensfun-0.2.7-memset.patch new file mode 100644 index 0000000..2b79e48 --- /dev/null +++ b/media-libs/lensfun/files/lensfun-0.2.7-memset.patch @@ -0,0 +1,13 @@ +libs/auxfun/image.cpp: In member function ‘bool Image::SavePNG(const char*)’: +libs/auxfun/image.cpp:258:42: error: ‘memset’ was not declared in this scope + +--- libs/auxfun/image.cpp ++++ libs/auxfun/image.cpp +@@ -6,6 +6,7 @@ + #include "image.h" + #include + #include ++#include + #include + #ifdef _MSC_VER + #define _USE_MATH_DEFINES 1 diff --git a/media-libs/lensfun/lensfun-0.2.5-r2.ebuild b/media-libs/lensfun/lensfun-0.2.5-r2.ebuild index a30034b..c53ab7d 100644 --- a/media-libs/lensfun/lensfun-0.2.5-r2.ebuild +++ b/media-libs/lensfun/lensfun-0.2.5-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.5-r2.ebuild,v 1.13 2012/05/05 08:02:45 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.5-r2.ebuild,v 1.14 2013/03/03 11:05:34 vapier Exp $ EAPI=2 inherit eutils python toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" IUSE="debug doc" RDEPEND=">=dev-libs/glib-2 diff --git a/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild b/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild index 266721f..a8bf3ab 100644 --- a/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild +++ b/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild,v 1.2 2012/05/29 16:39:52 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild,v 1.3 2013/03/03 11:05:34 vapier Exp $ EAPI=4 inherit python multilib cmake-utils @@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" IUSE="doc" RDEPEND=">=dev-libs/glib-2 diff --git a/media-libs/lensfun/lensfun-0.2.6.ebuild b/media-libs/lensfun/lensfun-0.2.6.ebuild index c7d884c..89d4f5d 100644 --- a/media-libs/lensfun/lensfun-0.2.6.ebuild +++ b/media-libs/lensfun/lensfun-0.2.6.ebuild @@ -1,28 +1,35 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild,v 1.2 2012/05/29 16:39:52 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.6.ebuild,v 1.4 2013/03/03 11:05:34 vapier Exp $ EAPI=4 -inherit python multilib cmake-utils + +PYTHON_DEPEND="2:2.6" + +inherit cmake-utils multilib python DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions" HOMEPAGE="http://lensfun.berlios.de/" SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2" -LICENSE="LGPL-3" +LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning. SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd" -IUSE="doc" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +IUSE="doc sse sse2" -RDEPEND=">=dev-libs/glib-2 - >=media-libs/libpng-1.2" +RDEPEND=">=dev-libs/glib-2.28 + media-libs/libpng:0 + sys-libs/zlib" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" PATCHES=( - "${FILESDIR}/${PN}-0.2.5_p153-build.patch" - "${FILESDIR}/${PN}-0.2.5_p153-pc.patch" -) + "${FILESDIR}"/${P}-auxfun.patch + "${FILESDIR}"/${PN}-0.2.5_p153-build.patch + "${FILESDIR}"/${PN}-0.2.5_p153-pc.patch + ) + +DOCS=( README docs/mounts.txt ) pkg_setup() { python_set_active_version 2 @@ -30,10 +37,16 @@ pkg_setup() { } src_configure() { - mycmakeargs=( - $(cmake-utils_use_build doc) + local mycmakeargs=( + -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html -DLIBDIR=$(get_libdir) - -DDOCDIR=/usr/share/doc/${P} - ) + -DBUILD_AUXFUN=ON + $(cmake-utils_use_build doc) + $(cmake-utils_use_build sse FOR_SSE) + $(cmake-utils_use_build sse2 FOR_SSE2) + -DBUILD_STATIC=OFF + -DBUILD_TESTS=OFF + ) + cmake-utils_src_configure } diff --git a/media-libs/lensfun/lensfun-0.2.7.ebuild b/media-libs/lensfun/lensfun-0.2.7.ebuild new file mode 100644 index 0000000..91eb70d --- /dev/null +++ b/media-libs/lensfun/lensfun-0.2.7.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.7.ebuild,v 1.3 2013/04/06 10:08:14 ssuominen Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_{6,7} ) + +inherit multilib python-single-r1 cmake-utils + +DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions" +HOMEPAGE="http://lensfun.berlios.de/" +SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2" + +LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning. +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +IUSE="doc sse sse2" + +RDEPEND=">=dev-libs/glib-2.28 + media-libs/libpng:0= + sys-libs/zlib:=" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${PN}-0.2.6-auxfun.patch + "${FILESDIR}"/${P}-memset.patch + ) + +DOCS=( README docs/mounts.txt ) + +src_configure() { + local mycmakeargs=( + -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html + -DLIBDIR=$(get_libdir) + -DBUILD_AUXFUN=ON + $(cmake-utils_use_build doc) + $(cmake-utils_use_build sse FOR_SSE) + $(cmake-utils_use_build sse2 FOR_SSE2) + -DBUILD_STATIC=OFF + -DBUILD_TESTS=OFF + ) + + cmake-utils_src_configure +}