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
