[gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/

[Markus Meier]

commit:     d72eddcc9bf65bee4872a6eb749e188a6c9bce39
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 13:36:55 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 13:36:55 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=d72eddcc

sync media-libs/lensfun

Package-Manager: portage-2.2.14_rc1
Manifest-Sign-Key: 072AD062

---
 media-libs/lensfun/Manifest                        | 16 +++---
 .../lensfun/files/lensfun-0.2.6-auxfun.patch       | 11 ----
 media-libs/lensfun/files/lensfun-0.2.7-build.patch | 60 ----------------------
 .../lensfun/files/lensfun-0.2.7-memset.patch       | 13 -----
 ...fun-0.2.8-support-clang-visibility-as-gcc.patch | 14 +++++
 media-libs/lensfun/lensfun-0.2.7.ebuild            | 49 ------------------
 media-libs/lensfun/lensfun-0.2.8-r1.ebuild         |  3 +-
 media-libs/lensfun/lensfun-0.2.8.ebuild            |  4 +-
 8 files changed, 24 insertions(+), 146 deletions(-)

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 0760546..042b81e 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
 AUX lensfun-0.2.8-build.patch 1898 SHA256 ca4b4c4431f10b3ec54a97a02b582f558c135d921d9667e6f40998bae56336dd SHA512 1794a5313f06feeec5d2bcd86338f5a2c500bf80d34d6cd92db3402272b0c385965b4c36cc0fe7ce6aa54bd7f523a868f52b9d61919fb05d7eb2b343adf532c6 WHIRLPOOL e7eeb1581ee56a6db95c8fc908309a379a96af33d9a26d2b916801c8a680174beb4385405a51df8eb37001bdd91cc92a75172bcf8012faa7eec6961e5840860e
 AUX lensfun-0.2.8-r1-build.patch 1343 SHA256 ed8401c6ac26c637ac7b8860f51033a53a505bc1be1c394b722d91a429f7133f SHA512 4e71b37cb24951091379bbcfbace9b7b5f5b3b402254e79baaf6e2cd7ee89897bb332b47328878c33889aebe99dfc601dc876edfb795fae31fe92c53cdf0f750 WHIRLPOOL fcba03641c0ae3424940b03c62eed5fc52e22e7ebbc09a7ef891e17b9f6397209928418c27f3af9c025a2745a0ee61e109c5bf67aa1033c3688e9670321e5af0
+AUX lensfun-0.2.8-support-clang-visibility-as-gcc.patch 733 SHA256 f0e50a5f3e813c75c7dd6c21132a1a9b21b807e5d4a46b66c9d04c24f055513a SHA512 1d8583132bbed9f155f508a173f0a56459113917f51d8754bd41d77f8e757ad0af721f23b689530470bec1089004bd0d19a9f4cf88bb3b865d35b005b1bac80b WHIRLPOOL 1cd161a7cab59d1ddfe0a94fd85f9846b6d54b23d5f9251e1415bc31217ac649fc6d6270e9da62be79d3ea49b809dd4a004395c29acaa534f3557da79f1faefb
 AUX lensfun-0.2.8-x32.patch 944 SHA256 54d7b5413d39d25776e1a9a87171de132814652d08b0b122de41cad95110b9a7 SHA512 6b21eb3cf3f84892b27eb76bf6af39767cca061d3762f019280961157349bb5829f6a61de8b6879e886471db3b47d3395bafdf043b4829428092f9eb90514a2f WHIRLPOOL 1b1010acfceeddf4532af5e7b8a12d7702f6c503a972638547ba4d84ce607c2a2d1264c93f5433efa0567f3d486549f0951e48814c6810bbc2cd1c2cfaf4332b
-DIST lensfun-0.2.7.tar.bz2 552960 SHA256 3ddf0747bd6af1ec7d722f8c45dafdd8adfb96c081492b216c14d89f82806477 SHA512 0df48ef824bd562065cc1eaf611870ab526cd64a32f99947f1f1c0c633280f4fc2f248d38da65dc0627d399085da4c35c938a42a64753976c8dfb5fbd97c96f2 WHIRLPOOL 039f93f4a8dcd6d3ec88ad453151346ba6c92b3d36130c406c9aed7cbfad9c2a2bdfcfe866df5070026042f3980ed345604bda0d8faf4130f078d26da9032dc8
 DIST lensfun-0.2.8.tar.bz2 628913 SHA256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48 SHA512 46fc545882884f806e3e4c8c49237243123f1f463379a4161821f627eb63b61815fcfe9c19f239b733a311c2c952e4a652fabe2d8e351e31d8157a5f2600e284 WHIRLPOOL 84118fe34e9a6984a5567546daf95ab7e5945e93efcfb45bcd86a157b6b20f3764921c53cfecd9419c9cb0205df8e940f61a828ae575f76bf12282b9b4fad0cc
-EBUILD lensfun-0.2.7.ebuild 1316 SHA256 42b932ca6682c273ae2f13e7cfab440ec62b578ecbf9aca058accca4e81f37f9 SHA512 b03517fa7bd7bb082bad967db58519f1ac3372dab753c5b402327a5e88bdda70cb01dab10677162be0e822cc22e1968ed7121575b39a3b39da74ecf5c9d21e21 WHIRLPOOL 0069735b2588b324eae30ed5a8ddb40744b1eb6f0b2a1fd40c192e2b50cb6ea9a61da542b68f8190b08887201819d0fe5c286bf9479eab82411729f701c7f0ef
-EBUILD lensfun-0.2.8-r1.ebuild 1283 SHA256 8a1fa94ea575556ff7aee920f01f7ecd27823c4fcd76830b97c332574083e93f SHA512 1fd8dd5211b35019c53164d6564deb3d087fe614e5b5cee322545f171fff5555086d9dc024f9460a07b9bd5a84d222253065c030002e2a467a35f2eceb1b36cc WHIRLPOOL ea718dd322420025902f444ef9ce6241f926215503ef91e031abcf6555debf7be91c1978f39bd92930f39d6c76f0878608d3dc572d038988b7045e8791df5830
-EBUILD lensfun-0.2.8.ebuild 1284 SHA256 8655c9a150d823a57530465625a77a821f1507cde38a83610b609a7ee07a4b4d SHA512 78218f12a14e5b18b4c5189e334c0e0075f37478090e24d57b1c144354ac119e50f2bc4e445d8f2de514054e484a9469789f0221c05e9fb24a7ea48698f72c6b WHIRLPOOL 2c9bc9d936d1429b2a1e76e99516306f8a76ad7161133fa1204fbdea8539418d2913cc43cb2113b96f175c9da788a844fa1c36e7f20db57c4a4335032383d150
+EBUILD lensfun-0.2.8-r1.ebuild 1344 SHA256 9568cd387bf83b33be8cac54efbcb9b191f1d916964c8a07aed92486d0789896 SHA512 cf25e843c1ba7f035813bffdfacb34a1f19962fc0ccd884262b33e3d29f3e2f4503546ebff3fbdadaa44b5b651ed732931f9ef881d55c1c5c511b815e704765d WHIRLPOOL 7ad1a2b81bc45ab7d92e9aa465e12db21d248b14e4fcb7aabac9fe2363eca4da4431a705d2b1921139cac4b435c828fb6ac0c344cc662051fa05ee6303c12eda
+EBUILD lensfun-0.2.8.ebuild 1275 SHA256 45c1763e4cec962f62d12ce88b5130409b19d7614e0604cf2dbed78377abd262 SHA512 ff83b68c3ace9f1da0967dd1a31409e3343fec3f0a2327f0d9985476529f42f5093ed94d7b7150a3974244dbe9fd1c472e3022dea54407ebe621a2c67fbb3d14 WHIRLPOOL 298546946256fc620f5ebd5b6b32df9e23417e879264ac7bd0e941b2da682a4d68c369214f8c7f36ba96f2b6fa53ccfa645257c97469c28254f9336655c81425
 MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f SHA512 3735e2c7fd32e4b2309ebbfb2f8e3107698a5d722fbbb712bddda7dc665af5d994e8f213c06e247ff0fa04f09f209be2cd4fdac4ef218c5b60c99a65334944bf WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPLy+sACgkQkKaRLQcq0GLSCgCcCvGu8jRsrWLiDSIAD9SKnuhp
-w5YAoI3IEwujOcVcBS1lSYBGSd4+kSho
-=7JaX
+iEYEAREIAAYFAlQmvXcACgkQkKaRLQcq0GJKIQCdEiesNPZYxUpZkL9A3PNaYbKE
+R5oAniRquytSk3uJRXhPlktbCI/Wy6s1
+=G/ED
 -----END PGP SIGNATURE-----

diff --git a/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch b/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch
deleted file mode 100644
index c8d989f..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.7-build.patch b/media-libs/lensfun/files/lensfun-0.2.7-build.patch
deleted file mode 100644
index ebf557c..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.7-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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
- OPTION(BUILD_STATIC "Build static library" OFF)
--OPTION(BUILD_TESTS "Build test programs" ON)
-+OPTION(BUILD_TESTS "Build test programs" OFF)
- 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)
-@@ -74,10 +74,10 @@
-  
- # define destination dirs (relative to prefix)
- SET(BINDIR bin)
--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)
-   # install into place in build-dir  
-@@ -131,12 +131,12 @@
- ENDIF()
- 
- # install include files
--INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR}/lensfun)
-+INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR})
- IF(NOT HAVE_REGEX_H)
-   INSTALL(FILES include/regex/regex.h DESTINATION ${INCLUDEDIR}/regex)
- ENDIF()
- IF(BUILD_AUXFUN)
--  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR}/auxfun)
-+  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR})
- 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
deleted file mode 100644
index 2b79e48..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.7-memset.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 <zlib.h>
- #include <png.h>
-+#include <string.h>
- #include <stdlib.h>
- #ifdef _MSC_VER
- #define _USE_MATH_DEFINES 1

diff --git a/media-libs/lensfun/files/lensfun-0.2.8-support-clang-visibility-as-gcc.patch b/media-libs/lensfun/files/lensfun-0.2.8-support-clang-visibility-as-gcc.patch
new file mode 100644
index 0000000..83462ee
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.8-support-clang-visibility-as-gcc.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/show_bug.cgi?id=519006
+
+diff -Nuar lensfun-0.2.8.orig/include/lensfun/lensfun.h.in lensfun-0.2.8/include/lensfun/lensfun.h.in
+--- lensfun-0.2.8.orig/include/lensfun/lensfun.h.in     2013-01-27 17:32:37.000000000 +0100
++++ lensfun-0.2.8/include/lensfun/lensfun.h.in  2014-08-05 08:14:20.096691200 +0200
+@@ -62,7 +62,7 @@
+ #   ifdef CONF_SYMBOL_VISIBILITY
+ #       if defined PLATFORM_WINDOWS
+ #           define LF_EXPORT    __declspec(dllexport)
+-#       elif defined CONF_COMPILER_GCC
++#       elif defined CONF_COMPILER_GCC || __clang__
+ #           define LF_EXPORT    __attribute__((visibility("default")))
+ #       else
+ #           error "I don't know how to change symbol visibility for your compiler"

diff --git a/media-libs/lensfun/lensfun-0.2.7.ebuild b/media-libs/lensfun/lensfun-0.2.7.ebuild
deleted file mode 100644
index 7f251e7..0000000
--- a/media-libs/lensfun/lensfun-0.2.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 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.14 2014/06/15 11:50:15 maekke 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.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${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 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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
-}

diff --git a/media-libs/lensfun/lensfun-0.2.8-r1.ebuild b/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
index a78c430..60f58ed 100644
--- a/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8.ebuild,v 1.7 2014/06/19 18:16:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8-r1.ebuild,v 1.2 2014/09/14 09:05:46 maekke Exp $
 
 EAPI=5
 
@@ -28,6 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}"/${PF}-build.patch
 	"${FILESDIR}"/${P}-x32.patch
+	"${FILESDIR}"/${P}-support-clang-visibility-as-gcc.patch
 )
 
 DOCS=( README docs/mounts.txt )

diff --git a/media-libs/lensfun/lensfun-0.2.8.ebuild b/media-libs/lensfun/lensfun-0.2.8.ebuild
index 17e3daf..c96e66b 100644
--- a/media-libs/lensfun/lensfun-0.2.8.ebuild
+++ b/media-libs/lensfun/lensfun-0.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8.ebuild,v 1.7 2014/06/19 18:16:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8.ebuild,v 1.12 2014/08/03 18:38:36 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc sse sse2"
 
 RDEPEND=">=dev-libs/glib-2.28