From 134abce79e8e82b227604ac33ea36c3f49f3f902 Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Sat, 14 Apr 2012 16:16:37 +0000 Subject: Version bump to snapshot, using CMake build system, should fix bug 374547 (Portage version: 2.2.0_alpha100/cvs/Linux x86_64) --- media-libs/lensfun/ChangeLog | 10 +++- .../lensfun/files/lensfun-0.2.5_p153-build.patch | 65 ++++++++++++++++++++++ media-libs/lensfun/lensfun-0.2.5_p153.ebuild | 36 ++++++++++++ 3 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch create mode 100644 media-libs/lensfun/lensfun-0.2.5_p153.ebuild (limited to 'media-libs') diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog index e6ccc4ca5a7b..3249149e5cd8 100644 --- a/media-libs/lensfun/ChangeLog +++ b/media-libs/lensfun/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/lensfun -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.39 2011/10/30 19:13:18 dilfridge Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.40 2012/04/14 16:16:37 dilfridge Exp $ + +*lensfun-0.2.5_p153 (14 Apr 2012) + + 14 Apr 2012; Andreas K. Huettel + +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 lensfun-0.2.5-r2.ebuild: 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 000000000000..d204bc66f7a3 --- /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/lensfun-0.2.5_p153.ebuild b/media-libs/lensfun/lensfun-0.2.5_p153.ebuild new file mode 100644 index 000000000000..e30a7c39cdf9 --- /dev/null +++ b/media-libs/lensfun/lensfun-0.2.5_p153.ebuild @@ -0,0 +1,36 @@ +# 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.ebuild,v 1.1 2012/04/14 16:16:37 dilfridge 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" +IUSE="doc" + +RDEPEND=">=dev-libs/glib-2 + >=media-libs/libpng-1.2" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +PATCHES=( "${FILESDIR}/${P}-build.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 +} -- cgit v1.2.3-65-gdbad