From 3ffd8f1fda90ba11ab72e78af9229913c60d00ae Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Thu, 2 Jan 2014 16:05:15 +0100 Subject: media-libs/lensfun: Drop, applied upstream, bug #466220 --- media-libs/lensfun/ChangeLog | 6 --- media-libs/lensfun/Manifest | 6 --- media-libs/lensfun/files/lensfun-0.2.8-build.patch | 42 -------------------- media-libs/lensfun/files/lensfun-0.2.8-x32.patch | 40 ------------------- media-libs/lensfun/lensfun-0.2.8.ebuild | 46 ---------------------- media-libs/lensfun/metadata.xml | 9 ----- metadata/md5-cache/media-libs/lensfun-0.2.8 | 13 ------ 7 files changed, 162 deletions(-) delete mode 100644 media-libs/lensfun/ChangeLog delete mode 100644 media-libs/lensfun/Manifest delete mode 100644 media-libs/lensfun/files/lensfun-0.2.8-build.patch delete mode 100644 media-libs/lensfun/files/lensfun-0.2.8-x32.patch delete mode 100644 media-libs/lensfun/lensfun-0.2.8.ebuild delete mode 100644 media-libs/lensfun/metadata.xml delete mode 100644 metadata/md5-cache/media-libs/lensfun-0.2.8 diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog deleted file mode 100644 index 8a560627..00000000 --- a/media-libs/lensfun/ChangeLog +++ /dev/null @@ -1,6 +0,0 @@ -*lensfun-0.2.8 (27 Dec 2013) - - 27 Dec 2013; Bertrand Jacquin - +files/lensfun-0.2.8-build.patch, +files/lensfun-0.2.8-x32.patch, - +lensfun-0.2.8.ebuild, +metadata.xml: - media-libs/lensfun: Add fix for x32, bug #466220 diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest deleted file mode 100644 index 80d32997..00000000 --- a/media-libs/lensfun/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX lensfun-0.2.8-build.patch 1898 SHA256 ca4b4c4431f10b3ec54a97a02b582f558c135d921d9667e6f40998bae56336dd WHIRLPOOL e7eeb1581ee56a6db95c8fc908309a379a96af33d9a26d2b916801c8a680174beb4385405a51df8eb37001bdd91cc92a75172bcf8012faa7eec6961e5840860e -AUX lensfun-0.2.8-x32.patch 944 SHA256 54d7b5413d39d25776e1a9a87171de132814652d08b0b122de41cad95110b9a7 WHIRLPOOL 1b1010acfceeddf4532af5e7b8a12d7702f6c503a972638547ba4d84ce607c2a2d1264c93f5433efa0567f3d486549f0951e48814c6810bbc2cd1c2cfaf4332b -DIST lensfun-0.2.8.tar.bz2 628913 SHA256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48 WHIRLPOOL 84118fe34e9a6984a5567546daf95ab7e5945e93efcfb45bcd86a157b6b20f3764921c53cfecd9419c9cb0205df8e940f61a828ae575f76bf12282b9b4fad0cc -EBUILD lensfun-0.2.8.ebuild 1232 SHA256 1be3d1e51d47a95ac03fff5cae262a7d25936656bb32c558f689d2393d7f5c88 WHIRLPOOL e2029f45b62823956b9e2ce88c8d121cc33c5d2230fc63f572079c23c94578f7d6771d0cd0b9b81c4c604355774936bd378b91927d5032d20f47459c91fd59b8 -MISC ChangeLog 242 SHA256 9849ca8a4c8a0e65e3991ee357776ce7fa3f75c13ac8eaeac76027be51cb9f94 WHIRLPOOL e5c378206326676d377d9a55972f6205833ac636e14019528289d99ceff471c5dc9df28bb6909072da39a47905e9a339d275f4d99229b58e9827215bcb749738 -MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef 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 80dd59d7..00000000 --- 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-x32.patch b/media-libs/lensfun/files/lensfun-0.2.8-x32.patch deleted file mode 100644 index 90cc956f..00000000 --- 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.ebuild b/media-libs/lensfun/lensfun-0.2.8.ebuild deleted file mode 100644 index 1aa0fe5d..00000000 --- a/media-libs/lensfun/lensfun-0.2.8.ebuild +++ /dev/null @@ -1,46 +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.8.ebuild,v 1.1 2013/12/18 22:25:47 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.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}"/${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 -} diff --git a/media-libs/lensfun/metadata.xml b/media-libs/lensfun/metadata.xml deleted file mode 100644 index 85dbbcb4..00000000 --- a/media-libs/lensfun/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -graphics - -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. - - - diff --git a/metadata/md5-cache/media-libs/lensfun-0.2.8 b/metadata/md5-cache/media-libs/lensfun-0.2.8 deleted file mode 100644 index ebd46dda..00000000 --- a/metadata/md5-cache/media-libs/lensfun-0.2.8 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test -DEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:= doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=lensfun: A library for rectifying and simulating photographic lens distortions -EAPI=5 -HOMEPAGE=http://lensfun.berlios.de/ -IUSE=doc sse sse2 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7 -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux -LICENSE=LGPL-3 CC-BY-SA-3.0 -RDEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:= -SLOT=0 -SRC_URI=mirror://berlios/lensfun/lensfun-0.2.8.tar.bz2 -_eclasses_=cmake-utils 0ff4fbaea3a849e97cb3e0b87ab99136 eutils d04e3933e3ec7e338a0561a6b0ae66b1 flag-o-matic 62e05953761097ae84a70d6c7a3e2c9c multilib 892e597faee02a5b94eb02ab512e7622 python-single-r1 82a55861314bbcedaf1e08ed4dd651b3 python-utils-r1 49ee0ca5e1019d8f256a23692dad2642 toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=5973794704314a93358bf63bf3313f21 -- cgit v1.2.3