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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/
@ 2015-07-18  6:42 Markus Meier
  0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier @ 2015-07-18  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     1bf6c9a4d5d95989d4e6941b775a83fd97fc1921
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 06:42:48 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 06:42:48 2015 +0000
URL:        https://gitweb.gentoo.org/dev/maekke.git/commit/?id=1bf6c9a4

sync with gentoo-x86

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 072AD062

 media-libs/lensfun/Manifest                        | 14 ++-----
 media-libs/lensfun/files/lensfun-0.2.8-build.patch | 42 -------------------
 .../lensfun/files/lensfun-0.2.8-r1-build.patch     | 27 ------------
 ...fun-0.2.8-support-clang-visibility-as-gcc.patch | 14 -------
 media-libs/lensfun/files/lensfun-0.2.8-x32.patch   | 40 ------------------
 media-libs/lensfun/lensfun-0.2.8-r1.ebuild         | 49 ----------------------
 media-libs/lensfun/lensfun-0.3.0.ebuild            |  4 +-
 7 files changed, 6 insertions(+), 184 deletions(-)

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index b167002..79bd62f 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,22 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
 AUX lensfun-0.3.0-rst2man.patch 1112 SHA256 2880cd8ad47f8c310b9cba0ecfc6193bc788d6db16ad9232b224dbe1809be0da SHA512 a7017f968333ffa3bfe746600b3c30dee7d9a288fb0a758f02ee03547b9ec23f364a04e9322984748c8599bd9976dbc6dde9f287efe3d668e6260c5a469ecb1b WHIRLPOOL 5ec38e9eb53efd3d1207f9487b670823c63f7e6530f63dee93630199e1262ad8464dac43232337fea4b709337b4e4e2d340b6b0d3c02b138828db729116cc1e6
-DIST lensfun-0.2.8.tar.bz2 628913 SHA256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48 SHA512 46fc545882884f806e3e4c8c49237243123f1f463379a4161821f627eb63b61815fcfe9c19f239b733a311c2c952e4a652fabe2d8e351e31d8157a5f2600e284 WHIRLPOOL 84118fe34e9a6984a5567546daf95ab7e5945e93efcfb45bcd86a157b6b20f3764921c53cfecd9419c9cb0205df8e940f61a828ae575f76bf12282b9b4fad0cc
 DIST lensfun-0.3.0.tar.bz2 636694 SHA256 c2c3c03873cb549d49d42f118fcb0ffa95d1e45b9ff395e19facb63bf699bec1 SHA512 2b0a57b3ae48401908d51372814424c1076d4219400935990af917f131e34261c44122773114c045a39db9062d6a0146cd44e20e3942d2bf3c281a5cc1494cc7 WHIRLPOOL 898b19dcfc70e8721bba45a8782f9e33a17180ab4ce21eef06b874f1bcf76bc0cae8231fdcff797ceb0bdd086266a42a47ebe6d63d20d0595aee11bbe713484a
 DIST lensfun-0.3.1.tar.gz 761892 SHA256 216c23754212e051c8b834437e46af3812533bd770c09714e8c06c9d91cdb535 SHA512 cd0f142bb7d6aa154f587d89502da35473a7a02660246bd025ccd5d1982f55425359405898e11ce9094351ad44a2d6786b9ff07d227f75699e99e4de8f40938c WHIRLPOOL f71fc6452253dd4bb5f40cab8079bdb7a0d36a0ef1ad969261c997ce2b944f4ffd8116b3f4f522567c630099bb84b5cb8b4a57f5ea7141e2b8a0cdc2ceab5c20
-EBUILD lensfun-0.2.8-r1.ebuild 1388 SHA256 c0a1eae6545240519e370618baa58bd6354f075c3ca99d65c819b35df1321e50 SHA512 0efb978e3d9f235ea5f8683c1703dac5b06bb0aae88c598f0c1dc4ce9f48a1a6293172dc42cbfc8fffea9f60e8585c677446a977ee7aa8638f32fa08150ecc1f WHIRLPOOL b8b949524a764062d4a09f15f786037aaa0262e756c623c0d2bf4b635e6ffee82d18e3c529d69f705393ce51e95275787e53ddce74d837662be4ba1fe1161eda
-EBUILD lensfun-0.3.0.ebuild 1355 SHA256 270b2974391b967e2fa3a51ad487bc6aa327ca598d14197156c36309a0700d90 SHA512 a91e9f7cf378eeb9c231b79ddd6e09a31912d75ea3352928273124f5ebd23b1c2086ceefbb525835eb7fab22488210f5efe01d472e64df7423a046ddd3abab59 WHIRLPOOL db588a0bfd546c905f807040259400a927a3430724804c1b3749188e84da74063bb7ee0b77fd23e044a4db874fb6ab100ff1c316bf5e849b4ea1d53a98bdd3ac
+EBUILD lensfun-0.3.0.ebuild 1354 SHA256 b6ed0e9640cd216b4c1075304e8c8cde054473988b6cdfcfba6d1f27800a94a7 SHA512 27d84f57b8b1585c0395724d4136ae117dc99a5d6c4566d673fa21f0c9ac2a56a5e6c753fccb65a288123c281288c7d988152cc6297f760f5ebb0018aa3de440 WHIRLPOOL 59e85974f82ad2333f6482fdbe02c94613fb2d049908ffd216dad05c049370f9257b3b67d442cacc27d9052bfe979de26b746b25d274efcb1d033bbbe06d53d9
 EBUILD lensfun-0.3.1.ebuild 1337 SHA256 38f9d262d66d3ed7c341c64bc32d3686ac3e0a82661ece2fcee6581aa3441217 SHA512 4e2f0fcc3a1ae5537dc8bc31704c59573dee0ebdf177cb611b22668fcca62a73e62e4eb6eb7e5975be16b0d627f292803606f83ad8fe16fdcfd132500b42cde1 WHIRLPOOL d34d58c6db1f70ec10f0038eb022d25a1ae4c0e436be4abbf9279a779aeb075ef5dbffe519ea88235d9c580255e29d541816f64eb79baf3d6aeab39e7fa8714a
 MISC metadata.xml 512 SHA256 213a66e9090b7d05c4c033cb190b270fd791b2d4b6fd7edf8eddac46e59db030 SHA512 dd642ba1580aa10c327f91fc79544337b915e6efed3c19f100c6ff699dba0eca76b6ab29c985304a7d05d2144460d4239ce954fd5bfe49af9dbac89ceb7b9bb9 WHIRLPOOL ea3a317069c9a83ab906e9d2069770892d0ffd8d07fc5d12e6451890811e6338d9ae9bf01ecf783c4ababf3f82a20b174fc78ee01302551a996093999cd7aa61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWPt2wACgkQkKaRLQcq0GKHPACfYuuViqxiw1eFrkf1/tw+q3rS
-rzwAnRM9weKXi2ghMh1cVAxoJi8cmCJI
-=IFGa
+iEYEAREIAAYFAlWp9WgACgkQkKaRLQcq0GJ8AwCdHhkdUFX+uIgV3l3LJZ4jwgjg
+cSEAnifiVMP7RI1HE58yal5Grlql8blE
+=XBZs
 -----END PGP SIGNATURE-----

diff --git a/media-libs/lensfun/files/lensfun-0.2.8-build.patch b/media-libs/lensfun/files/lensfun-0.2.8-build.patch
deleted file mode 100644
index 80dd59d..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.8-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru lensfun-0.2.8.orig/CMakeLists.txt lensfun-0.2.8/CMakeLists.txt
---- lensfun-0.2.8.orig/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
-+++ lensfun-0.2.8/CMakeLists.txt	2013-12-18 23:18:12.289679316 +0100
-@@ -74,14 +74,9 @@
-  
- # define destination dirs (relative to prefix)
- SET(BINDIR bin CACHE PATH "Directory for library example programs")
--SET(LIBDIR lib${LIB_SUFFIX} CACHE PATH "Directory for library itself")
- SET(INCLUDEDIR include CACHE PATH "Directory for library header files")
- SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
- 
--IF(BUILD_DOC)
--  SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX} CACHE PATH "Directory to put library documentation in")
--ENDIF(BUILD_DOC)
--
- IF(WIN32)
-   # install into place in build-dir  
-   SET(LENSFUN_INSTALL_PREFIX "${SOURCE_BASE_DIR}/lensfun" CACHE PATH "Install prefix for lensfun")    
-@@ -134,12 +129,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
-diff -ru lensfun-0.2.8.orig/docs/CMakeLists.txt lensfun-0.2.8/docs/CMakeLists.txt
---- lensfun-0.2.8.orig/docs/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
-+++ lensfun-0.2.8/docs/CMakeLists.txt	2013-12-18 23:19:27.578052651 +0100
-@@ -20,4 +20,4 @@
- )
- 
- # install documentation  
--INSTALL(DIRECTORY ${CMAKE_DOC_OUT}/ DESTINATION ${DOCDIR})
-+INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR})

diff --git a/media-libs/lensfun/files/lensfun-0.2.8-r1-build.patch b/media-libs/lensfun/files/lensfun-0.2.8-r1-build.patch
deleted file mode 100644
index 452de68..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.8-r1-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru lensfun-0.2.8.orig/CMakeLists.txt lensfun-0.2.8/CMakeLists.txt
---- lensfun-0.2.8.orig/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
-+++ lensfun-0.2.8/CMakeLists.txt	2013-12-18 23:18:12.289679316 +0100
-@@ -74,14 +74,9 @@
-  
- # define destination dirs (relative to prefix)
- SET(BINDIR bin CACHE PATH "Directory for library example programs")
--SET(LIBDIR lib${LIB_SUFFIX} CACHE PATH "Directory for library itself")
- SET(INCLUDEDIR include CACHE PATH "Directory for library header files")
- SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
- 
--IF(BUILD_DOC)
--  SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX} CACHE PATH "Directory to put library documentation in")
--ENDIF(BUILD_DOC)
--
- IF(WIN32)
-   # install into place in build-dir  
-   SET(LENSFUN_INSTALL_PREFIX "${SOURCE_BASE_DIR}/lensfun" CACHE PATH "Install prefix for lensfun")    
-diff -ru lensfun-0.2.8.orig/docs/CMakeLists.txt lensfun-0.2.8/docs/CMakeLists.txt
---- lensfun-0.2.8.orig/docs/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
-+++ lensfun-0.2.8/docs/CMakeLists.txt	2013-12-18 23:19:27.578052651 +0100
-@@ -20,4 +20,4 @@
- )
- 
- # install documentation  
--INSTALL(DIRECTORY ${CMAKE_DOC_OUT}/ DESTINATION ${DOCDIR})
-+INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR})

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
deleted file mode 100644
index 83462ee..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.8-support-clang-visibility-as-gcc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/files/lensfun-0.2.8-x32.patch b/media-libs/lensfun/files/lensfun-0.2.8-x32.patch
deleted file mode 100644
index 90cc956..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.8-x32.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: libs/lensfun/cpuid.cpp
-===================================================================
---- libs/lensfun/cpuid.cpp	(revision 380)
-+++ libs/lensfun/cpuid.cpp	(working copy)
-@@ -65,16 +65,16 @@
- #else
- #if defined (__i386__) || defined (__x86_64__)
- 
--#if defined (__i386__)
-+#ifdef __x86_64__
-+#  define R_AX	"rax"
-+#  define R_BX	"rbx"
-+#  define R_CX	"rcx"
-+#  define R_DX	"rdx"
-+#else
- #  define R_AX	"eax"
- #  define R_BX	"ebx"
- #  define R_CX	"ecx"
- #  define R_DX	"edx"
--#elif defined (__x86_64__)
--#  define R_AX	"rax"
--#  define R_BX	"rbx"
--#  define R_CX	"rcx"
--#  define R_DX	"rdx"
- #endif
- 
- // Borrowed from RawStudio
-@@ -88,7 +88,11 @@
-        : "=a" (ax), "=c" (cx),  "=d" (dx) \
-        : "0" (cmd))
- 
--    __SIZE_TYPE__ ax, cx, dx, tmp;
-+#ifdef __x86_64__
-+    guint64 ax, cx, dx, tmp;
-+#else
-+    guint32 ax, cx, dx, tmp;
-+#endif
-     static GStaticMutex lock = G_STATIC_MUTEX_INIT;
-     static guint cpuflags = -1;
- 

diff --git a/media-libs/lensfun/lensfun-0.2.8-r1.ebuild b/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
deleted file mode 100644
index 8ead78d..0000000
--- a/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 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-r1.ebuild,v 1.9 2015/05/01 19:15:46 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc cpu_flags_x86_sse cpu_flags_x86_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}"/${PF}-build.patch
-	"${FILESDIR}"/${P}-x32.patch
-	"${FILESDIR}"/${P}-support-clang-visibility-as-gcc.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 cpu_flags_x86_sse FOR_SSE)
-		$(cmake-utils_use_build cpu_flags_x86_sse2 FOR_SSE2)
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=OFF
-		)
-
-	cmake-utils_src_configure
-}

diff --git a/media-libs/lensfun/lensfun-0.3.0.ebuild b/media-libs/lensfun/lensfun-0.3.0.ebuild
index dc23778..59c1fc4 100644
--- a/media-libs/lensfun/lensfun-0.3.0.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.3.0.ebuild,v 1.11 2015/06/19 17:11:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.3.0.ebuild,v 1.13 2015/07/17 12:27:37 zlogene 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 cpu_flags_x86_sse cpu_flags_x86_sse2"
 
 RDEPEND=">=dev-libs/glib-2.28


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/
@ 2014-09-27 13:40 Markus Meier
  0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier @ 2014-09-27 13:40 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/
@ 2014-07-20 13:53 Markus Meier
  0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier @ 2014-07-20 13:53 UTC (permalink / raw
  To: gentoo-commits

commit:     033244885f124099fc990ac004411160c910f84c
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 20 14:02:19 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jul 20 14:02:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=03324488

do not modify header installation path, drop python2.6

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 072AD062

---
 media-libs/lensfun/Manifest                        | 10 +++--
 .../lensfun/files/lensfun-0.2.8-r1-build.patch     | 27 ++++++++++++
 media-libs/lensfun/lensfun-0.2.8-r1.ebuild         | 48 ++++++++++++++++++++++
 3 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 3960e32..0760546 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -5,16 +5,18 @@ AUX lensfun-0.2.6-auxfun.patch 500 SHA256 173cd284ba1b4ba61137e09327fae25725f892
 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-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
 MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f SHA512 3735e2c7fd32e4b2309ebbfb2f8e3107698a5d722fbbb712bddda7dc665af5d994e8f213c06e247ff0fa04f09f209be2cd4fdac4ef218c5b60c99a65334944bf WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOjM2AACgkQkKaRLQcq0GJr2QCffe0zlJ6qwOlbjqqI5uHpts/3
-1v8An3CG50jJqw7XAGOwUHl/y/AyFAjz
-=LTpx
+iEYEAREIAAYFAlPLy+sACgkQkKaRLQcq0GLSCgCcCvGu8jRsrWLiDSIAD9SKnuhp
+w5YAoI3IEwujOcVcBS1lSYBGSd4+kSho
+=7JaX
 -----END PGP SIGNATURE-----

diff --git a/media-libs/lensfun/files/lensfun-0.2.8-r1-build.patch b/media-libs/lensfun/files/lensfun-0.2.8-r1-build.patch
new file mode 100644
index 0000000..452de68
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.8-r1-build.patch
@@ -0,0 +1,27 @@
+diff -ru lensfun-0.2.8.orig/CMakeLists.txt lensfun-0.2.8/CMakeLists.txt
+--- lensfun-0.2.8.orig/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
++++ lensfun-0.2.8/CMakeLists.txt	2013-12-18 23:18:12.289679316 +0100
+@@ -74,14 +74,9 @@
+  
+ # define destination dirs (relative to prefix)
+ SET(BINDIR bin CACHE PATH "Directory for library example programs")
+-SET(LIBDIR lib${LIB_SUFFIX} CACHE PATH "Directory for library itself")
+ SET(INCLUDEDIR include CACHE PATH "Directory for library header files")
+ SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
+ 
+-IF(BUILD_DOC)
+-  SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX} CACHE PATH "Directory to put library documentation in")
+-ENDIF(BUILD_DOC)
+-
+ IF(WIN32)
+   # install into place in build-dir  
+   SET(LENSFUN_INSTALL_PREFIX "${SOURCE_BASE_DIR}/lensfun" CACHE PATH "Install prefix for lensfun")    
+diff -ru lensfun-0.2.8.orig/docs/CMakeLists.txt lensfun-0.2.8/docs/CMakeLists.txt
+--- lensfun-0.2.8.orig/docs/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
++++ lensfun-0.2.8/docs/CMakeLists.txt	2013-12-18 23:19:27.578052651 +0100
+@@ -20,4 +20,4 @@
+ )
+ 
+ # install documentation  
+-INSTALL(DIRECTORY ${CMAKE_DOC_OUT}/ DESTINATION ${DOCDIR})
++INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR})

diff --git a/media-libs/lensfun/lensfun-0.2.8-r1.ebuild b/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
new file mode 100644
index 0000000..a78c430
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
@@ -0,0 +1,48 @@
+# 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 $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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 ~mips ~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}"/${PF}-build.patch
+	"${FILESDIR}"/${P}-x32.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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/
@ 2014-06-15 11:48 Markus Meier
  0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier @ 2014-06-15 11:48 UTC (permalink / raw
  To: gentoo-commits

commit:     a5873aa39c5ae026ec90e30be49024ebe8399d02
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 15 11:39:29 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jun 15 11:39:29 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=a5873aa3

sync with gentoo-x86

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 072AD062

---
 media-libs/lensfun/Manifest                        | 19 ++-----
 .../lensfun/files/lensfun-0.2.5-libpng15.patch     | 40 --------------
 .../lensfun/files/lensfun-0.2.5_p153-build.patch   | 61 ----------------------
 .../lensfun/files/lensfun-0.2.5_p153-pc.patch      | 15 ------
 media-libs/lensfun/lensfun-0.2.5-r2.ebuild         | 56 --------------------
 media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild    | 39 --------------
 media-libs/lensfun/lensfun-0.2.6.ebuild            | 52 ------------------
 media-libs/lensfun/lensfun-0.2.7.ebuild            |  6 +--
 media-libs/lensfun/lensfun-0.2.8.ebuild            |  4 +-
 9 files changed, 10 insertions(+), 282 deletions(-)

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index a2bef12..eafbaa5 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
 AUX lensfun-0.2.8-build.patch 1898 SHA256 ca4b4c4431f10b3ec54a97a02b582f558c135d921d9667e6f40998bae56336dd SHA512 1794a5313f06feeec5d2bcd86338f5a2c500bf80d34d6cd92db3402272b0c385965b4c36cc0fe7ce6aa54bd7f523a868f52b9d61919fb05d7eb2b343adf532c6 WHIRLPOOL e7eeb1581ee56a6db95c8fc908309a379a96af33d9a26d2b916801c8a680174beb4385405a51df8eb37001bdd91cc92a75172bcf8012faa7eec6961e5840860e
 AUX lensfun-0.2.8-x32.patch 944 SHA256 54d7b5413d39d25776e1a9a87171de132814652d08b0b122de41cad95110b9a7 SHA512 6b21eb3cf3f84892b27eb76bf6af39767cca061d3762f019280961157349bb5829f6a61de8b6879e886471db3b47d3395bafdf043b4829428092f9eb90514a2f WHIRLPOOL 1b1010acfceeddf4532af5e7b8a12d7702f6c503a972638547ba4d84ce607c2a2d1264c93f5433efa0567f3d486549f0951e48814c6810bbc2cd1c2cfaf4332b
-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
 DIST lensfun-0.2.8.tar.bz2 628913 SHA256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48 SHA512 46fc545882884f806e3e4c8c49237243123f1f463379a4161821f627eb63b61815fcfe9c19f239b733a311c2c952e4a652fabe2d8e351e31d8157a5f2600e284 WHIRLPOOL 84118fe34e9a6984a5567546daf95ab7e5945e93efcfb45bcd86a157b6b20f3764921c53cfecd9419c9cb0205df8e940f61a828ae575f76bf12282b9b4fad0cc
-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 1309 SHA256 cdce1dc32822e55954c6025cf39bf7d6b7d14f69c905c83a3b81b9b0cbe9ceaa SHA512 0496dda19467bb343dec23d2a359358df6f5c021a2311fa5cdc163764a23387229da365432bcf3d9603397cbf33bcd7a7921eab297a5cd48647682a49e2eff98 WHIRLPOOL 34802f132d5375b14e985fe1e41b9cc9858e5a8f147e683b06fb71d823efa73e4a862f6c77d431721c61f03739102ef3f2180ef7494d20de5570c4dd4766b1c6
-EBUILD lensfun-0.2.8.ebuild 1271 SHA256 fafee6e973edd5790fce4182af5ec55fa183682daacc6a28ab1ecc4caa052ac0 SHA512 a55bce03e503d6c3ddff8104eaa7a7a4d7f94fde4dfd97a1b3fb131eefd7653f7bd1dfffe8c05dbc0ae9a5a66a6cf2892ff2a3d89e23c99ce5d50d340522a20d WHIRLPOOL e0f5cad10c0a24c02deb4988f5b9f931d83e9f490322de552c9b4049096c05f65ef53ce54fc3768107902a1d8e82e8707ec03b2cfa2bde56e5f3531639252594
+EBUILD lensfun-0.2.7.ebuild 1304 SHA256 4a4ae3fd5b71e0d62803777d47b3b08c744700c2db829295b8cf7a7a4c8c6156 SHA512 07faac60228f51147fb974d5b52222fe4e633919897c4f0fb9429f6bbb71bde48e71570120f5e63ba1f50303cb88c249ebb0f541862ce8b3fc5087332a96a59a WHIRLPOOL d847b9cdab80cec2a8cb37851248a5e8fca4e748da67a5a82750d7544dded979ba4fa3cdb744c721849ae9cdc56595bc7ae2207ef9dc38356ca76c2f0b65a2f9
+EBUILD lensfun-0.2.8.ebuild 1278 SHA256 1c8238013d00d350296f85148b169ee04926657997240f7290eef380cfc69c02 SHA512 36c0580d63bd15dc2f28004e58ae191ed006eed68f4268975ae6ef883cca1789f1f6ab794d207bff068183ec54127b7addd1d0216d1330c0a211651243ba7b06 WHIRLPOOL e3bc6bf294839e2bdea9e42b2a18fd75105c2c33d260debf5906d0fe59513259208e390eec9b2745ee04c276f6d12ccea40623edcee98b26cc3b857a8ffaddac
 MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f SHA512 3735e2c7fd32e4b2309ebbfb2f8e3107698a5d722fbbb712bddda7dc665af5d994e8f213c06e247ff0fa04f09f209be2cd4fdac4ef218c5b60c99a65334944bf WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLFQvoACgkQkKaRLQcq0GKvwgCgkILOvo6MoZ/v4BpKYvUs4gHh
-a+8An3BssnCEMBURbakxlHdhy/tLVITz
-=viVq
+iEYEAREIAAYFAlOdhfEACgkQkKaRLQcq0GKPlQCbB3kPZnJwBqMANvKdFiNLXiDK
+VWMAniqInsKDhIi+1cqkjzge1n4bR86g
+=pQUr
 -----END PGP SIGNATURE-----

diff --git a/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch b/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch
deleted file mode 100644
index 6d10b6c..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libs/auxfun/image.cpp
-+++ libs/auxfun/image.cpp
-@@ -94,7 +94,7 @@ bool Image::LoadPNG ()
- 
-     png_init_io (png, file);
- 
--    if (setjmp (png->jmpbuf))
-+    if (setjmp (png_jmpbuf(png)))
-         // If we get here, we had a problem reading the file
-         goto nomem;
- 
-@@ -157,7 +157,7 @@ bool Image::LoadPNG ()
-     row_pointers = new png_bytep [Height];
- 
-     if (!row_pointers
--        || setjmp (png->jmpbuf))             // Set a new exception handler
-+        || setjmp (png_jmpbuf(png)))             // Set a new exception handler
-     {
-         delete [] row_pointers;
-     nomem:
-@@ -214,7 +214,7 @@ bool Image::SavePNG (const char *fName)
-     }
- 
-     /* Catch processing errors */
--    if (setjmp(png->jmpbuf))
-+    if (setjmp(png_jmpbuf(png)))
-         /* If we get here, we had a problem writing the file */
-         goto error2;
- 
-@@ -273,10 +273,6 @@ bool Image::SavePNG (const char *fName)
-     /* It is REQUIRED to call this to finish writing the rest of the file */
-     png_write_end (png, info);
- 
--    /* if you malloced the palette, free it here */
--    if (info->palette)
--        free (info->palette);
--
-     /* clean up after the write, and free any memory allocated */
-     png_destroy_write_struct (&png, &info);
- 

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
deleted file mode 100644
index 425031d..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- docs/CMakeLists.txt
-+++ docs/CMakeLists.txt
-@@ -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})
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -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)
-@@ -71,13 +71,13 @@
- IF(BUILD_STATIC)
-   ADD_DEFINITIONS(-DCONF_LENSFUN_STATIC)
- ENDIF()
-- 
-+
- # define destination dirs (relative to prefix)
- SET(BINDIR bin)
--SET(LIBDIR lib)
-+# SET(LIBDIR lib)
- 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 @@
- 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

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
deleted file mode 100644
index a68cf55..0000000
--- a/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libs/lensfun/CMakeLists.txt
-+++ libs/lensfun/CMakeLists.txt
-@@ -26,3 +26,12 @@
-         RUNTIME DESTINATION ${BINDIR}
-         LIBRARY DESTINATION ${LIBDIR}
-         ARCHIVE DESTINATION ${LIBDIR})
-+
-+IF(UNIX AND NOT APPLE)
-+  SET(CONF_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}")
-+  SET(CONF_LIBDIR "${CMAKE_INSTALL_LIBDIR}/")
-+  SET(CONF_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${INCLUDEDIR}/")
-+  SET(CONF_LENSFUN_STATIC "")
-+  CONFIGURE_FILE("lensfun.pc.in" "lensfun.pc" @ONLY)
-+  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-+ENDIF(UNIX AND NOT APPLE)

diff --git a/media-libs/lensfun/lensfun-0.2.5-r2.ebuild b/media-libs/lensfun/lensfun-0.2.5-r2.ebuild
deleted file mode 100644
index c53ab7d..0000000
--- a/media-libs/lensfun/lensfun-0.2.5-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.14 2013/03/03 11:05:34 vapier Exp $
-
-EAPI=2
-inherit eutils python toolchain-funcs
-
-DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="http://lensfun.berlios.de/"
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="debug doc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=media-libs/libpng-1.2"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.0 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# disable stripping, remove ricer CFLAGS
-	sed -i \
-		-e 's:-s -O3 -fomit-frame-pointer -funroll-loops::g' \
-		-e 's:GCC.LDFLAGS.release = -s:GCC.LDFLAGS.release =:g' \
-		build/tibs/compiler/gcc.mak || die
-
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-	tc-export CXX
-	export LD="${CXX}"
-
-	local myconf=""
-	use debug && myconf="--mode=debug"
-	# econf does NOT work
-	./configure --prefix=/usr --docdir="/usr/share/doc/${PF}" --vectorization= ${myconf} || die
-}
-
-src_compile() {
-	emake all V=1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	# TODO remove docs if ! use doc
-}

diff --git a/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild b/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild
deleted file mode 100644
index a8bf3ab..0000000
--- a/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.3 2013/03/03 11:05:34 vapier Exp $
-
-EAPI=4
-inherit python multilib cmake-utils
-
-DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="http://lensfun.berlios.de/"
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=media-libs/libpng-1.2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-pc.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build doc)
-		-DLIBDIR=$(get_libdir)
-		-DDOCDIR=/usr/share/doc/${P}
-	)
-	cmake-utils_src_configure
-}

diff --git a/media-libs/lensfun/lensfun-0.2.6.ebuild b/media-libs/lensfun/lensfun-0.2.6.ebuild
deleted file mode 100644
index 89d4f5d..0000000
--- a/media-libs/lensfun/lensfun-0.2.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.6.ebuild,v 1.4 2013/03/03 11:05:34 vapier Exp $
-
-EAPI=4
-
-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 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}-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
-	python_pkg_setup
-}
-
-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.7.ebuild b/media-libs/lensfun/lensfun-0.2.7.ebuild
index 46551cd..de8a03c 100644
--- a/media-libs/lensfun/lensfun-0.2.7.ebuild
+++ b/media-libs/lensfun/lensfun-0.2.7.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/lensfun/lensfun-0.2.7.ebuild,v 1.11 2013/12/30 09:12:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.7.ebuild,v 1.13 2014/01/18 20:05:05 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ 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"
+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

diff --git a/media-libs/lensfun/lensfun-0.2.8.ebuild b/media-libs/lensfun/lensfun-0.2.8.ebuild
index 47c2f09..6552368 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.2 2013/12/30 09:12:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8.ebuild,v 1.4 2014/03/04 19:59:40 vincent Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/
@ 2014-01-02 10:37 Markus Meier
  0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier @ 2014-01-02 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b879c88f4a0b0de9d58d693f363bd0be05cdf537
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 10:44:10 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 10:44:10 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=b879c88f

fix building on x32 by Torsten Bronger, bug #466220

Package-Manager: portage-2.2.7
Manifest-Sign-Key: 072AD062

---
 media-libs/lensfun/Manifest                      |  9 +++---
 media-libs/lensfun/files/lensfun-0.2.8-x32.patch | 40 ++++++++++++++++++++++++
 media-libs/lensfun/lensfun-0.2.8.ebuild          |  3 +-
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index bacb8b0..a2bef12 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -8,6 +8,7 @@ AUX lensfun-0.2.6-auxfun.patch 500 SHA256 173cd284ba1b4ba61137e09327fae25725f892
 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-x32.patch 944 SHA256 54d7b5413d39d25776e1a9a87171de132814652d08b0b122de41cad95110b9a7 SHA512 6b21eb3cf3f84892b27eb76bf6af39767cca061d3762f019280961157349bb5829f6a61de8b6879e886471db3b47d3395bafdf043b4829428092f9eb90514a2f WHIRLPOOL 1b1010acfceeddf4532af5e7b8a12d7702f6c503a972638547ba4d84ce607c2a2d1264c93f5433efa0567f3d486549f0951e48814c6810bbc2cd1c2cfaf4332b
 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
@@ -17,12 +18,12 @@ EBUILD lensfun-0.2.5-r2.ebuild 1441 SHA256 33062b3bdffdb3397cd73d6c2409d7f263e7d
 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 1309 SHA256 cdce1dc32822e55954c6025cf39bf7d6b7d14f69c905c83a3b81b9b0cbe9ceaa SHA512 0496dda19467bb343dec23d2a359358df6f5c021a2311fa5cdc163764a23387229da365432bcf3d9603397cbf33bcd7a7921eab297a5cd48647682a49e2eff98 WHIRLPOOL 34802f132d5375b14e985fe1e41b9cc9858e5a8f147e683b06fb71d823efa73e4a862f6c77d431721c61f03739102ef3f2180ef7494d20de5570c4dd4766b1c6
-EBUILD lensfun-0.2.8.ebuild 1241 SHA256 b7bc338314863280e017d7a3492f5946b0cc3389fba248cceaf1ede4e45aab4b SHA512 20ff9acfbdf698d8b2d884a0a9802376bf60431e3de9cd93a54150011f6795ecee4030fbbeb2bfb747a9c814235c76c867f1ac37a98cd9dbd953917adc32e1b3 WHIRLPOOL 2074da3aa9ca576fcf7a90f79fbf1c04e182e9db881262c1333d6b35ff53b47f3557a1d887924c31c7494ee543144f4b1c35f2f583e263153c4ef875aaa108cf
+EBUILD lensfun-0.2.8.ebuild 1271 SHA256 fafee6e973edd5790fce4182af5ec55fa183682daacc6a28ab1ecc4caa052ac0 SHA512 a55bce03e503d6c3ddff8104eaa7a7a4d7f94fde4dfd97a1b3fb131eefd7653f7bd1dfffe8c05dbc0ae9a5a66a6cf2892ff2a3d89e23c99ce5d50d340522a20d WHIRLPOOL e0f5cad10c0a24c02deb4988f5b9f931d83e9f490322de552c9b4049096c05f65ef53ce54fc3768107902a1d8e82e8707ec03b2cfa2bde56e5f3531639252594
 MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f SHA512 3735e2c7fd32e4b2309ebbfb2f8e3107698a5d722fbbb712bddda7dc665af5d994e8f213c06e247ff0fa04f09f209be2cd4fdac4ef218c5b60c99a65334944bf WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLFQZYACgkQkKaRLQcq0GK63ACfV7nWn/yLVkdRsc+E2r+poMea
-y7UAnjJcPbzyAfq8I9BwF0EuwuDPL2M0
-=WHCt
+iEYEAREIAAYFAlLFQvoACgkQkKaRLQcq0GKvwgCgkILOvo6MoZ/v4BpKYvUs4gHh
+a+8An3BssnCEMBURbakxlHdhy/tLVITz
+=viVq
 -----END PGP SIGNATURE-----

diff --git a/media-libs/lensfun/files/lensfun-0.2.8-x32.patch b/media-libs/lensfun/files/lensfun-0.2.8-x32.patch
new file mode 100644
index 0000000..90cc956
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.8-x32.patch
@@ -0,0 +1,40 @@
+Index: libs/lensfun/cpuid.cpp
+===================================================================
+--- libs/lensfun/cpuid.cpp	(revision 380)
++++ libs/lensfun/cpuid.cpp	(working copy)
+@@ -65,16 +65,16 @@
+ #else
+ #if defined (__i386__) || defined (__x86_64__)
+ 
+-#if defined (__i386__)
++#ifdef __x86_64__
++#  define R_AX	"rax"
++#  define R_BX	"rbx"
++#  define R_CX	"rcx"
++#  define R_DX	"rdx"
++#else
+ #  define R_AX	"eax"
+ #  define R_BX	"ebx"
+ #  define R_CX	"ecx"
+ #  define R_DX	"edx"
+-#elif defined (__x86_64__)
+-#  define R_AX	"rax"
+-#  define R_BX	"rbx"
+-#  define R_CX	"rcx"
+-#  define R_DX	"rdx"
+ #endif
+ 
+ // Borrowed from RawStudio
+@@ -88,7 +88,11 @@
+        : "=a" (ax), "=c" (cx),  "=d" (dx) \
+        : "0" (cmd))
+ 
+-    __SIZE_TYPE__ ax, cx, dx, tmp;
++#ifdef __x86_64__
++    guint64 ax, cx, dx, tmp;
++#else
++    guint32 ax, cx, dx, tmp;
++#endif
+     static GStaticMutex lock = G_STATIC_MUTEX_INIT;
+     static guint cpuflags = -1;
+ 

diff --git a/media-libs/lensfun/lensfun-0.2.8.ebuild b/media-libs/lensfun/lensfun-0.2.8.ebuild
index 025699e..47c2f09 100644
--- a/media-libs/lensfun/lensfun-0.2.8.ebuild
+++ b/media-libs/lensfun/lensfun-0.2.8.ebuild
@@ -1,4 +1,4 @@
-# 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/lensfun/lensfun-0.2.8.ebuild,v 1.2 2013/12/30 09:12:23 mgorny Exp $
 
@@ -27,6 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-x32.patch
 )
 
 DOCS=( README docs/mounts.txt )


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/
@ 2013-12-18 22:22 Markus Meier
  0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier @ 2013-12-18 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     6309305da00aa9c5f0ea95e414b4fffcfb8e13c9
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 22:27:57 2013 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 22:27:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=6309305d

version bump

Package-Manager: portage-2.2.7
Manifest-Sign-Key: 072AD062

---
 media-libs/lensfun/Manifest                        | 15 ++++----
 media-libs/lensfun/files/lensfun-0.2.8-build.patch | 42 ++++++++++++++++++++
 media-libs/lensfun/lensfun-0.2.8.ebuild            | 45 ++++++++++++++++++++++
 3 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 6f4c943..29f8f69 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -7,24 +7,23 @@ AUX lensfun-0.2.5_p153-pc.patch 650 SHA256 ab4ff4243ce94db8df5ed737292fd9d805e93
 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
 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
+DIST lensfun-0.2.8.tar.bz2 628913 SHA256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48 SHA512 46fc545882884f806e3e4c8c49237243123f1f463379a4161821f627eb63b61815fcfe9c19f239b733a311c2c952e4a652fabe2d8e351e31d8157a5f2600e284 WHIRLPOOL 84118fe34e9a6984a5567546daf95ab7e5945e93efcfb45bcd86a157b6b20f3764921c53cfecd9419c9cb0205df8e940f61a828ae575f76bf12282b9b4fad0cc
 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
+EBUILD lensfun-0.2.8.ebuild 1205 SHA256 7995406e199197e78130985ef8ca61c6cd79714e83ade1c59ba5d401a5e99ce4 SHA512 98def20bd7a58185837ac44ad63d1813afb22767a4ca8f380bc8576469435dbdb7fad0760385874478a67397ccfcdde3aab443229389c313301438ac57451de9 WHIRLPOOL 9bbe42987e2dfb8d5dfdcf9beeec8426e115b931f3e9c67a4744a00366f28a1181dfdafec2684a679817e29451ec74a0a9f22082f13a913cc7632608a316d10a
 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)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRX/PwAAoJEEdUh39IaPFNqxUH/0KNmU5O+3uCBm+o6AWI39Dx
-p3JlXO9PPcn9tg8VGPzdPRjOPdgoAseCcUQAAGI/BHg4/als+Q+EvjDF6rzuXu0T
-Mt13ik5zkyfcHDoK9X32u3Bty+RcwsUeww0vYUAUkWauoqnZa4uzuEad3LL5ZxVi
-+P6FeBYGklD83sfdChYr8tP7qU/VJIMAwQPFlyJHOL3+dtWbpo5FKdeD1UzOuxtV
-OAjY6Gyk6kPVtQYKeuBUjajF7jSB6dzK1y0eMSfn7k/1YdUPszgtJhvpHc2VoUgY
-iwS2OzjiEra4/9kDme8XTq5/ue0N15bSBmWqh29j7ykauPGhbqOVyodM4hZTuzg=
-=aQse
+iEYEAREIAAYFAlKyIW0ACgkQkKaRLQcq0GJpWQCfXRspUl2rtcuMYJxBLcJvoInd
+ewUAniMBzpodRRg0fmXnkZT8iyose/mq
+=leEV
 -----END PGP SIGNATURE-----

diff --git a/media-libs/lensfun/files/lensfun-0.2.8-build.patch b/media-libs/lensfun/files/lensfun-0.2.8-build.patch
new file mode 100644
index 0000000..80dd59d
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.8-build.patch
@@ -0,0 +1,42 @@
+diff -ru lensfun-0.2.8.orig/CMakeLists.txt lensfun-0.2.8/CMakeLists.txt
+--- lensfun-0.2.8.orig/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
++++ lensfun-0.2.8/CMakeLists.txt	2013-12-18 23:18:12.289679316 +0100
+@@ -74,14 +74,9 @@
+  
+ # define destination dirs (relative to prefix)
+ SET(BINDIR bin CACHE PATH "Directory for library example programs")
+-SET(LIBDIR lib${LIB_SUFFIX} CACHE PATH "Directory for library itself")
+ SET(INCLUDEDIR include CACHE PATH "Directory for library header files")
+ SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
+ 
+-IF(BUILD_DOC)
+-  SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX} CACHE PATH "Directory to put library documentation in")
+-ENDIF(BUILD_DOC)
+-
+ IF(WIN32)
+   # install into place in build-dir  
+   SET(LENSFUN_INSTALL_PREFIX "${SOURCE_BASE_DIR}/lensfun" CACHE PATH "Install prefix for lensfun")    
+@@ -134,12 +129,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
+diff -ru lensfun-0.2.8.orig/docs/CMakeLists.txt lensfun-0.2.8/docs/CMakeLists.txt
+--- lensfun-0.2.8.orig/docs/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
++++ lensfun-0.2.8/docs/CMakeLists.txt	2013-12-18 23:19:27.578052651 +0100
+@@ -20,4 +20,4 @@
+ )
+ 
+ # install documentation  
+-INSTALL(DIRECTORY ${CMAKE_DOC_OUT}/ DESTINATION ${DOCDIR})
++INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR})

diff --git a/media-libs/lensfun/lensfun-0.2.8.ebuild b/media-libs/lensfun/lensfun-0.2.8.ebuild
new file mode 100644
index 0000000..ede93ec
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.2.8.ebuild
@@ -0,0 +1,45 @@
+# 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
+)
+
+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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/
@ 2013-10-01 19:03 Markus Meier
  0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier @ 2013-10-01 19:03 UTC (permalink / raw
  To: gentoo-commits

commit:     47b339c155befe1029f262e7b2a495a0bb5c55f8
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 12:46:12 2013 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> 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 <ssuominen@gentoo.org> lensfun-0.2.7.ebuild,
+  +files/lensfun-0.2.7-memset.patch:
+  Include <string.h> 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 <maekke@gentoo.org> lensfun-0.2.7.ebuild:
+  restore python-2.7 support
+
+*lensfun-0.2.7 (23 Mar 2013)
+
+  23 Mar 2013; Markus Meier <maekke@gentoo.org> +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 <vapier@gentoo.org> 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 <ulm@gentoo.org> lensfun-0.2.6.ebuild:
+  Move Creative Commons licenses to shorter names.
+
+  21 Sep 2012; Christoph Junghans <ottxor@gentoo.org> lensfun-0.2.6.ebuild:
+  added prefix support (bug #425342)
+
+*lensfun-0.2.6 (02 Jul 2012)
+
+  02 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> +lensfun-0.2.6.ebuild,
+  +files/lensfun-0.2.6-auxfun.patch:
+  Version bump.
 
   29 May 2012; Alexis Ballier <aballier@gentoo.org>
   lensfun-0.2.5_p153-r1.ebuild:
@@ -155,4 +185,3 @@
   01 Jun 2009; Markus Meier <maekke@gentoo.org> +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 <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/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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/
@ 2012-06-26 22:00 Markus Meier
  0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier @ 2012-06-26 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     46a698b1155f256dc7f673bf47a7f4f570eeef70
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 22:00:58 2012 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 22:00:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=46a698b1

bump lensfun to 0.2.6

(Portage version: 2.1.10.65/git/Linux i686, RepoMan options: --force, signed Manifest commit with key 072AD062)

---
 media-libs/lensfun/ChangeLog                       |  158 ++++++++++++++++++++
 media-libs/lensfun/Manifest                        |   21 +++
 .../lensfun/files/lensfun-0.2.5-libpng15.patch     |   40 +++++
 .../lensfun/files/lensfun-0.2.5_p153-build.patch   |   65 ++++++++
 .../lensfun/files/lensfun-0.2.5_p153-pc.patch      |   17 ++
 media-libs/lensfun/lensfun-0.2.5-r2.ebuild         |   56 +++++++
 media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild    |   39 +++++
 media-libs/lensfun/lensfun-0.2.6.ebuild            |   39 +++++
 media-libs/lensfun/metadata.xml                    |    9 +
 9 files changed, 444 insertions(+), 0 deletions(-)

diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog
new file mode 100644
index 0000000..5b7a77f
--- /dev/null
+++ b/media-libs/lensfun/ChangeLog
@@ -0,0 +1,158 @@
+# 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 $
+
+  29 May 2012; Alexis Ballier <aballier@gentoo.org>
+  lensfun-0.2.5_p153-r1.ebuild:
+  keyword ~amd64-fbsd
+
+*lensfun-0.2.5_p153-r1 (10 May 2012)
+
+  10 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -lensfun-0.2.5_p153.ebuild, +lensfun-0.2.5_p153-r1.ebuild,
+  +files/lensfun-0.2.5_p153-pc.patch:
+  Install pkg-config file, bug 412813
+
+  05 May 2012; Jeff Horelick <jdhore@gentoo.org> lensfun-0.2.5-r2.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+*lensfun-0.2.5_p153 (14 Apr 2012)
+
+  14 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +lensfun-0.2.5_p153.ebuild, +files/lensfun-0.2.5_p153-build.patch:
+  Version bump to snapshot, using CMake build system, should fix bug 374547
+
+  30 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  lensfun-0.2.5-r2.ebuild:
+  Berlios is going away :|
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -files/lensfun-0.2.3-as-needed.patch, -files/lensfun-0.2.3-glibc-2.10.patch,
+  -lensfun-0.2.4.ebuild, -lensfun-0.2.5.ebuild, -lensfun-0.2.5-r1.ebuild:
+  old
+
+  23 Oct 2011; Raúl Porcel <armin76@gentoo.org> lensfun-0.2.5-r2.ebuild:
+  alpha/ia64/sh/sparc stable wrt #385213
+
+  15 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> lensfun-0.2.5-r2.ebuild:
+  ppc stable wrt #385213
+
+  11 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> lensfun-0.2.5-r2.ebuild:
+  ppc64 stable wrt #385213
+
+  11 Oct 2011; Jeroen Roovers <jer@gentoo.org> lensfun-0.2.5-r2.ebuild:
+  Stable for HPPA (bug #385213).
+
+  10 Oct 2011; Markus Meier <maekke@gentoo.org> lensfun-0.2.5-r2.ebuild:
+  arm stable, bug #385213
+
+  04 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> lensfun-0.2.5-r2.ebuild:
+  x86 stable wrt bug #385213
+
+  04 Oct 2011; Markos Chandras <hwoarang@gentoo.org> lensfun-0.2.5-r2.ebuild:
+  Stable on amd64 wrt bug #385213
+
+  01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> lensfun-0.2.5-r2.ebuild:
+  Use full toolchain name wrt #385213, Comment #1 by Agostino Sarubbo.
+
+  23 Aug 2011; Tim Harder <radhermit@gentoo.org> lensfun-0.2.4.ebuild,
+  lensfun-0.2.5.ebuild, lensfun-0.2.5-r1.ebuild, lensfun-0.2.5-r2.ebuild:
+  Add build dependency on pkgconfig (bug #379517 by bay).
+
+*lensfun-0.2.5-r2 (07 Aug 2011)
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> +lensfun-0.2.5-r2.ebuild,
+  +files/lensfun-0.2.5-libpng15.patch:
+  Fix building with libpng15 wrt #368315 with NetBSD patch.
+
+  13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> lensfun-0.2.5-r1.ebuild:
+  ppc64 stable wrt #354033
+
+  01 Jun 2011; Brent Baude <ranger@gentoo.org> lensfun-0.2.5-r1.ebuild:
+  Marking lensfun-0.2.5-r1 ppc stable for bug 354033
+
+  09 May 2011; Thomas Kahle <tomka@gentoo.org> lensfun-0.2.5-r1.ebuild:
+  x86 stable per bug 354033
+
+  26 Apr 2011; Christoph Mende <angelos@gentoo.org> lensfun-0.2.5-r1.ebuild:
+  Stable on amd64 wrt bug #364173
+
+  19 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  lensfun-0.2.5-r1.ebuild:
+  Better python dep, thanks to Arfrever
+
+  19 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  lensfun-0.2.5-r1.ebuild:
+  Use python eclass to force python-2, bug 348885
+
+  19 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  lensfun-0.2.5-r1.ebuild:
+  Fix documentation path, bug 318639
+
+  17 Apr 2010; Raúl Porcel <armin76@gentoo.org> lensfun-0.2.5-r1.ebuild:
+  Add ~ia64/~sh/~sparc/ wrt #312819
+
+*lensfun-0.2.5-r1 (17 Apr 2010)
+
+  17 Apr 2010; Markus Meier <maekke@gentoo.org> +lensfun-0.2.5-r1.ebuild:
+  disable vectorization support for now, by Serge Gavrilov in bug #314643
+
+*lensfun-0.2.5 (02 Apr 2010)
+
+  02 Apr 2010; Markus Meier <maekke@gentoo.org> +lensfun-0.2.5.ebuild:
+  version bump
+
+  14 Feb 2010; Markus Meier <maekke@gentoo.org> -lensfun-0.2.3.ebuild:
+  old
+
+  31 Jan 2010; Raúl Porcel <armin76@gentoo.org> lensfun-0.2.4.ebuild:
+  arm stable wrt #293850
+
+  16 Jan 2010; Tobias Klausmann <klausman@gentoo.org> lensfun-0.2.4.ebuild:
+  Stable on alpha, bug #293850
+
+  28 Dec 2009; Markus Meier <maekke@gentoo.org> lensfun-0.2.4.ebuild:
+  x86 stable, bug #293850
+
+  23 Dec 2009; Markos Chandras <hwoarang@gentoo.org> lensfun-0.2.4.ebuild:
+  Stable on amd64 wrt bug #293850
+
+  16 Dec 2009; Jeroen Roovers <jer@gentoo.org> lensfun-0.2.4.ebuild:
+  Stable for HPPA (bug #272088).
+
+  08 Dec 2009; Brent Baude <ranger@gentoo.org> lensfun-0.2.4.ebuild:
+  Marking lensfun-0.2.4 ppc64 for bug 293850
+
+  21 Nov 2009; nixnut <nixnut@gentoo.org> lensfun-0.2.4.ebuild:
+  ppc stable #293850
+
+*lensfun-0.2.4 (19 Oct 2009)
+
+  19 Oct 2009; Markus Meier <maekke@gentoo.org> +lensfun-0.2.4.ebuild:
+  version bump, bug #289454
+
+  05 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> lensfun-0.2.3.ebuild:
+  Keywording for ppc, bug 272088
+
+  19 Sep 2009; Markus Meier <maekke@gentoo.org> lensfun-0.2.3.ebuild:
+  add ~arm, bug #272088
+
+  04 Jul 2009; Markus Meier <maekke@gentoo.org> lensfun-0.2.3.ebuild,
+  +files/lensfun-0.2.3-glibc-2.10.patch:
+  fix building with glibc-2.10, bug #276175
+
+  04 Jul 2009; Brent Baude <ranger@gentoo.org> lensfun-0.2.3.ebuild:
+  Marking lensfun-0.2.3 ~ppc64 for bug 272088
+
+  07 Jun 2009; Tobias Klausmann <klausman@gentoo.org> lensfun-0.2.3.ebuild:
+  Keyworded on alpha, bug #272088
+
+  03 Jun 2009; Markus Meier <maekke@gentoo.org> lensfun-0.2.3.ebuild:
+  add ~amd64, bug #272088
+
+*lensfun-0.2.3 (01 Jun 2009)
+
+  01 Jun 2009; Markus Meier <maekke@gentoo.org> +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
new file mode 100644
index 0000000..060ca2c
--- /dev/null
+++ b/media-libs/lensfun/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk/qMRoACgkQkKaRLQcq0GLxvwCfR89jb904WCjdUmi5vHgJBXlx
+UtQAnA70cQkQKE4Bd3el1k4NKZy+8UW6
+=x1Ox
+-----END PGP SIGNATURE-----

diff --git a/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch b/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch
new file mode 100644
index 0000000..6d10b6c
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch
@@ -0,0 +1,40 @@
+--- libs/auxfun/image.cpp
++++ libs/auxfun/image.cpp
+@@ -94,7 +94,7 @@ bool Image::LoadPNG ()
+ 
+     png_init_io (png, file);
+ 
+-    if (setjmp (png->jmpbuf))
++    if (setjmp (png_jmpbuf(png)))
+         // If we get here, we had a problem reading the file
+         goto nomem;
+ 
+@@ -157,7 +157,7 @@ bool Image::LoadPNG ()
+     row_pointers = new png_bytep [Height];
+ 
+     if (!row_pointers
+-        || setjmp (png->jmpbuf))             // Set a new exception handler
++        || setjmp (png_jmpbuf(png)))             // Set a new exception handler
+     {
+         delete [] row_pointers;
+     nomem:
+@@ -214,7 +214,7 @@ bool Image::SavePNG (const char *fName)
+     }
+ 
+     /* Catch processing errors */
+-    if (setjmp(png->jmpbuf))
++    if (setjmp(png_jmpbuf(png)))
+         /* If we get here, we had a problem writing the file */
+         goto error2;
+ 
+@@ -273,10 +273,6 @@ bool Image::SavePNG (const char *fName)
+     /* It is REQUIRED to call this to finish writing the rest of the file */
+     png_write_end (png, info);
+ 
+-    /* if you malloced the palette, free it here */
+-    if (info->palette)
+-        free (info->palette);
+-
+     /* clean up after the write, and free any memory allocated */
+     png_destroy_write_struct (&png, &info);
+ 

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
new file mode 100644
index 0000000..d204bc6
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch
@@ -0,0 +1,65 @@
+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)
+@@ -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)
+@@ -71,13 +71,13 @@
+ IF(BUILD_STATIC)
+   ADD_DEFINITIONS(-DCONF_LENSFUN_STATIC)
+ ENDIF()
+- 
++
+ # define destination dirs (relative to prefix)
+ SET(BINDIR bin)
+-SET(LIBDIR lib)
++# SET(LIBDIR lib)
+ 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 @@
+ 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

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
new file mode 100644
index 0000000..a74acf8
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch
@@ -0,0 +1,17 @@
+Index: libs/lensfun/CMakeLists.txt
+===================================================================
+--- libs/lensfun/CMakeLists.txt	(Revision 158)
++++ libs/lensfun/CMakeLists.txt	(Arbeitskopie)
+@@ -26,3 +26,12 @@
+         RUNTIME DESTINATION ${BINDIR}
+         LIBRARY DESTINATION ${LIBDIR}
+         ARCHIVE DESTINATION ${LIBDIR})
++
++IF(UNIX AND NOT APPLE)
++  SET(CONF_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}")
++  SET(CONF_LIBDIR "${CMAKE_INSTALL_LIBDIR}/")
++  SET(CONF_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${INCLUDEDIR}/")
++  SET(CONF_LENSFUN_STATIC "")
++  CONFIGURE_FILE("lensfun.pc.in" "lensfun.pc" @ONLY)
++  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++ENDIF(UNIX AND NOT APPLE)

diff --git a/media-libs/lensfun/lensfun-0.2.5-r2.ebuild b/media-libs/lensfun/lensfun-0.2.5-r2.ebuild
new file mode 100644
index 0000000..a30034b
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.2.5-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 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 $
+
+EAPI=2
+inherit eutils python toolchain-funcs
+
+DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="http://lensfun.berlios.de/"
+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"
+IUSE="debug doc"
+
+RDEPEND=">=dev-libs/glib-2
+	>=media-libs/libpng-1.2"
+DEPEND="${RDEPEND}
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.5.0 )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# disable stripping, remove ricer CFLAGS
+	sed -i \
+		-e 's:-s -O3 -fomit-frame-pointer -funroll-loops::g' \
+		-e 's:GCC.LDFLAGS.release = -s:GCC.LDFLAGS.release =:g' \
+		build/tibs/compiler/gcc.mak || die
+
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
+
+src_configure() {
+	tc-export CXX
+	export LD="${CXX}"
+
+	local myconf=""
+	use debug && myconf="--mode=debug"
+	# econf does NOT work
+	./configure --prefix=/usr --docdir="/usr/share/doc/${PF}" --vectorization= ${myconf} || die
+}
+
+src_compile() {
+	emake all V=1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	# TODO remove docs if ! use doc
+}

diff --git a/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild b/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild
new file mode 100644
index 0000000..266721f
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 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 $
+
+EAPI=4
+inherit python multilib cmake-utils
+
+DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="http://lensfun.berlios.de/"
+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"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2
+	>=media-libs/libpng-1.2"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-pc.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build doc)
+		-DLIBDIR=$(get_libdir)
+		-DDOCDIR=/usr/share/doc/${P}
+	)
+	cmake-utils_src_configure
+}

diff --git a/media-libs/lensfun/lensfun-0.2.6.ebuild b/media-libs/lensfun/lensfun-0.2.6.ebuild
new file mode 100644
index 0000000..c7d884c
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.2.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 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 $
+
+EAPI=4
+inherit python multilib 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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2
+	>=media-libs/libpng-1.2"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.5_p153-build.patch"
+	"${FILESDIR}/${PN}-0.2.5_p153-pc.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build doc)
+		-DLIBDIR=$(get_libdir)
+		-DDOCDIR=/usr/share/doc/${P}
+	)
+	cmake-utils_src_configure
+}

diff --git a/media-libs/lensfun/metadata.xml b/media-libs/lensfun/metadata.xml
new file mode 100644
index 0000000..85dbbcb
--- /dev/null
+++ b/media-libs/lensfun/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>graphics</herd>
+<longdescription lang="en">
+The project provides a database of photographic lenses and a library that allows advanced access to the database including functions to correct images based on intimate knowledge of lens characteristics and calibration data.
+</longdescription>
+</pkgmetadata>
+



^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2015-07-18  6:42 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-18  6:42 [gentoo-commits] dev/maekke:master commit in: media-libs/lensfun/files/, media-libs/lensfun/ Markus Meier
  -- strict thread matches above, loose matches on Subject: below --
2014-09-27 13:40 Markus Meier
2014-07-20 13:53 Markus Meier
2014-06-15 11:48 Markus Meier
2014-01-02 10:37 Markus Meier
2013-12-18 22:22 Markus Meier
2013-10-01 19:03 Markus Meier
2012-06-26 22:00 Markus Meier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox