From aa4bd3237e6a610267c34e56d61c34fbfbe3ad05 Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Fri, 9 Jul 2010 23:32:27 +0000 Subject: Version bump 1.2.0, fixes bug 206934 and 306679. Thanks to all involved in those bugs. (Portage version: 2.2_rc67/cvs/Linux x86_64) --- media-gfx/digikam/ChangeLog | 11 +- media-gfx/digikam/digikam-1.2.0-r2.ebuild | 94 ++++++++++ media-gfx/digikam/files/digikam-1.2.0-lapack.patch | 126 +++++++++++++ media-gfx/digikam/files/digikam-1.2.0-libpgf.patch | 208 +++++++++++++++++++++ .../digikam/files/digikam-1.2.0-ratingwidget.patch | 11 ++ media-gfx/digikam/metadata.xml | 3 +- 6 files changed, 451 insertions(+), 2 deletions(-) create mode 100644 media-gfx/digikam/digikam-1.2.0-r2.ebuild create mode 100644 media-gfx/digikam/files/digikam-1.2.0-lapack.patch create mode 100644 media-gfx/digikam/files/digikam-1.2.0-libpgf.patch create mode 100644 media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch (limited to 'media-gfx') diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index 8f7f48f44de4..859c9b4b4fd7 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-gfx/digikam # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.153 2010/06/21 14:07:32 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.154 2010/07/09 23:32:27 reavertm Exp $ + +*digikam-1.2.0-r2 (09 Jul 2010) + + 09 Jul 2010; Maciej Mrozowski + +digikam-1.2.0-r2.ebuild, +files/digikam-1.2.0-lapack.patch, + +files/digikam-1.2.0-libpgf.patch, + +files/digikam-1.2.0-ratingwidget.patch, metadata.xml: + Version bump 1.2.0, fixes bug 206934 and 306679. Thanks to all involved in + those bugs. 21 Jun 2010; Samuli Suominen digikam-1.1.0-r1.ebuild: diff --git a/media-gfx/digikam/digikam-1.2.0-r2.ebuild b/media-gfx/digikam/digikam-1.2.0-r2.ebuild new file mode 100644 index 000000000000..79b83040fa5d --- /dev/null +++ b/media-gfx/digikam/digikam-1.2.0-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r2.ebuild,v 1.1 2010/07/09 23:32:27 reavertm Exp $ + +EAPI="2" + +KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km +ko lt lv lb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW" +KMNAME="extragear/graphics" +inherit kde4-base + +MY_P="${PN}-${PV/_/-}" + +DESCRIPTION="A digital photo management application for KDE." +HOMEPAGE="http://www.digikam.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="4" +IUSE="addressbook debug doc geolocation gphoto2 lensfun semantic-desktop +thumbnails video" + +CDEPEND=" + >=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?] + >=kde-base/libkdcraw-${KDE_MINIMAL} + >=kde-base/libkexiv2-${KDE_MINIMAL} + >=kde-base/libkipi-${KDE_MINIMAL} + >=kde-base/solid-${KDE_MINIMAL} + media-libs/jasper + >=media-libs/jpeg-8 + media-libs/lcms:0 + media-libs/liblqr + media-libs/libpng + media-libs/tiff + media-libs/libpgf + >=media-plugins/kipi-plugins-1.2.0-r1 + virtual/lapack + x11-libs/qt-gui[qt3support] + x11-libs/qt-sql[sqlite] + addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} ) + geolocation? ( >=kde-base/marble-${KDE_MINIMAL} ) + gphoto2? ( media-libs/libgphoto2 ) + lensfun? ( media-libs/lensfun ) +" +RDEPEND="${CDEPEND} + >=kde-base/kreadconfig-${KDE_MINIMAL} + video? ( + || ( + >=kde-base/mplayerthumbs-${KDE_MINIMAL} + >=kde-base/ffmpegthumbs-${KDE_MINIMAL} + ) + ) +" +# gcc[fortran] is required since we cannot otherwise link to the lapack library +# (the fun of unbundling) +DEPEND="${CDEPEND} + sys-devel/gcc[fortran] + sys-devel/gettext +" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Patch to prevent a crash on startup in RatingWidget (kde#232628) + epatch "${FILESDIR}/${P}-ratingwidget.patch" + # Patch to unbundled libpgf. + epatch "${FILESDIR}/${P}-libpgf.patch" + # Patch to unbundle lapack. + epatch "${FILESDIR}/${P}-lapack.patch" + + kde4-base_src_prepare +} + +src_configure() { + local backend + + use semantic-desktop && backend="Nepomuk" || backend="None" + # LQR = only allows to choose between bundled/external + mycmakeargs=( + -DWITH_LQR=ON + -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} + $(cmake-utils_use_with addressbook KdepimLibs) + $(cmake-utils_use_build doc) + $(cmake-utils_use_with geolocation MarbleWidget) + $(cmake-utils_use_enable gphoto2 GPHOTO2) + $(cmake-utils_use_with gphoto2) + $(cmake-utils_use_with lensfun LensFun) + $(cmake-utils_use_with semantic-desktop Soprano) + -DENABLE_THEMEDESIGNER=OFF + $(cmake-utils_use_enable thumbnails THUMBS_DB) + ) + + kde4-base_src_configure +} diff --git a/media-gfx/digikam/files/digikam-1.2.0-lapack.patch b/media-gfx/digikam/files/digikam-1.2.0-lapack.patch new file mode 100644 index 000000000000..f7310788bee3 --- /dev/null +++ b/media-gfx/digikam/files/digikam-1.2.0-lapack.patch @@ -0,0 +1,126 @@ +diff -r -u digikam-1.2.0.orig/CMakeLists.txt digikam-1.2.0/CMakeLists.txt +--- digikam-1.2.0.orig/CMakeLists.txt 2010-05-30 21:38:14.189946492 +0200 ++++ digikam-1.2.0/CMakeLists.txt 2010-05-30 21:39:46.679946458 +0200 +@@ -3,6 +3,8 @@ + #OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF) + OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON) + ++ENABLE_LANGUAGE(Fortran) ++ + # ================================================================================================== + # Information to update before to release this package. + +@@ -123,6 +125,9 @@ + # This function call the script cmake/modules/FindPGF.cmake + FIND_PACKAGE(PGF) + ++# Included to unbundle lapack that is in portage tree. ++FIND_PACKAGE(LAPACK) ++ + FIND_PACKAGE(Jasper) + FIND_PACKAGE(Kdcraw) + FIND_PACKAGE(Kexiv2) +@@ -320,13 +325,13 @@ + MESSAGE(STATUS "") + ENDIF(DOXYGEN_FOUND) + +-IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) ++IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND) + MESSAGE(STATUS " digiKam will be compiled................. YES") + SET(DIGIKAM_CAN_BE_COMPILED true) +-ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) ++ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND) + MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") + SET(DIGIKAM_CAN_BE_COMPILED false) +-ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) ++ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND) + + MESSAGE(STATUS "----------------------------------------------------------------------------------") + MESSAGE(STATUS "") +@@ -484,39 +489,7 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp + ) + +- SET(libclapack_SRCS +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/endfile.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/idamax.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/open.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sig_die.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wref.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/close.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetf2.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dscal.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/err.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ieeeck.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_cmp.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_stop.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wrtfmt.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgemm.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrf.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dswap.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmt.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ilaenv.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_copy.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wsfe.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dger.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrs.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dtrsm.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmtlib.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/lsame.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sfe.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c +- ) ++ INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS}) + + SET(libdimgfilters_SRCS + ${libclapack_SRCS} +Nur in digikam-1.2.0: CMakeLists.txt.orig. +diff -r -u digikam-1.2.0.orig/digikam/CMakeLists.txt digikam-1.2.0/digikam/CMakeLists.txt +--- digikam-1.2.0.orig/digikam/CMakeLists.txt 2010-05-30 21:38:14.191892532 +0200 ++++ digikam-1.2.0/digikam/CMakeLists.txt 2010-05-30 21:39:46.680979177 +0200 +@@ -89,6 +89,7 @@ + ${PNG_PNG_INCLUDE_DIR} + ${TIFF_INCLUDE_DIR} + ${PGF_INCLUDE_DIRS} ++ ${LAPACK_INCLUDE_DIRS} + ) + + IF(LENSFUN_LIBRARY) +@@ -172,6 +173,7 @@ + ${PGF_LIBRARIES} + ${LCMS_LIBRARIES} + ${JASPER_LIBRARIES} ++ ${LAPACK_LIBRARIES} + + # Require by CImg library which use pthread internally. + ${CMAKE_THREAD_LIBS_INIT} +@@ -237,6 +239,7 @@ + ${QT_QTGUI_LIBRARY} + ${QT_QTSQL_LIBRARY} + ${PGF_LIBRARIES} ++ ${LAPACK_LIBRARIES} + ) + + SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) +Nur in digikam-1.2.0/digikam: CMakeLists.txt.orig. +diff -r -u digikam-1.2.0.orig/libs/CMakeLists.txt digikam-1.2.0/libs/CMakeLists.txt +--- digikam-1.2.0.orig/libs/CMakeLists.txt 2010-05-30 21:38:14.191892532 +0200 ++++ digikam-1.2.0/libs/CMakeLists.txt 2010-05-30 21:41:20.226778777 +0200 +@@ -14,12 +14,12 @@ + imageproperties + dialogs + 3rdparty/cimg +- 3rdparty/clapack + ${JPEG_INCLUDE_DIR} + ${TIFF_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} + ${PGF_INCLUDE_DIRS} + ${JASPER_INCLUDE_DIR} ++ ${LAPACK_INCLUDE_DIRS} + ) + ADD_SUBDIRECTORY( histogram ) + ADD_SUBDIRECTORY( dmetadata ) diff --git a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch b/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch new file mode 100644 index 000000000000..e788cf0e0055 --- /dev/null +++ b/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch @@ -0,0 +1,208 @@ +diff -ruN old/cmake/modules/FindPGF.cmake new/cmake/modules/FindPGF.cmake +--- old/cmake/modules/FindPGF.cmake 1969-12-31 21:00:00.000000000 -0300 ++++ new/cmake/modules/FindPGF.cmake 2010-03-30 13:54:13.520854878 -0300 +@@ -0,0 +1,15 @@ ++# - Try to find libpgf ++# Once done this will define ++# ++# PGF_FOUND - system has libgf ++# PGF_INCLUDE_DIRS - the libpgf include directory ++# PGF_LIBRARIES - Link these to use libpgf ++ ++# PKG-CONFIG is required. ++INCLUDE(FindPkgConfig REQUIRED) ++ ++IF(PKG_CONFIG_FOUND) ++ INCLUDE(FindPkgConfig) ++ ++ PKG_CHECK_MODULES(PGF libpgf) ++ENDIF(PKG_CONFIG_FOUND) +diff -ruN old/CMakeLists.txt new/CMakeLists.txt +--- old/CMakeLists.txt 2010-03-28 19:26:06.000000000 -0300 ++++ new/CMakeLists.txt 2010-03-30 19:50:55.537108644 -0300 +@@ -34,6 +34,9 @@ + "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" + ) + ++# Path to find FindPGF.cmake script. ++SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") ++ + # ================================================================================================== + # Debug area codes + # These codes will be set for every project specific path automatically, so +@@ -115,6 +118,11 @@ + FIND_PACKAGE(JPEG) + FIND_PACKAGE(PNG) + FIND_PACKAGE(TIFF) ++ ++# Included to unbundle libpgf that is on portage tree. ++# This function call the script cmake/modules/FindPGF.cmake ++FIND_PACKAGE(PGF) ++ + FIND_PACKAGE(Jasper) + FIND_PACKAGE(Kdcraw) + FIND_PACKAGE(Kexiv2) +@@ -210,6 +218,7 @@ + + PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) + PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND) ++PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND) + PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND) + PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND) + PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND) +@@ -311,13 +320,13 @@ + MESSAGE(STATUS "") + ENDIF(DOXYGEN_FOUND) + +-IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) ++IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) + MESSAGE(STATUS " digiKam will be compiled................. YES") + SET(DIGIKAM_CAN_BE_COMPILED true) +-ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) ++ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) + MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") + SET(DIGIKAM_CAN_BE_COMPILED false) +-ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) ++ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) + + MESSAGE(STATUS "----------------------------------------------------------------------------------") + MESSAGE(STATUS "") +@@ -952,14 +961,7 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp + ) + +- SET(libpgf_SRCS +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp +- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp +- ) ++ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) + + SET(libsqlite2_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c +@@ -1258,18 +1260,41 @@ + # ================================================================================================== + # API documentation generation + +-IF(DOXYGEN_FOUND) ++# Checks if user ask to build documentation. ++IF(BUILD_DOC) ++ IF(DOXYGEN_FOUND) ++ ++ MESSAGE(STATUS "") ++ MESSAGE(STATUS "Documentation will be installed") ++ MESSAGE(STATUS "") + +- SET(API_DIR ${CMAKE_BINARY_DIR}/api) +- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) +- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) +- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) ++ SET(API_DIR ${CMAKE_BINARY_DIR}/api) ++ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) ++ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) ++ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) + +- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) ++ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) + +- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) ++ ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} ++ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) ++ ++ ELSE(DOXYGEN_FOUND) ++ ++ MESSAGE(STATUS "") ++ MESSAGE(STATUS "Documentation will NOT be installed") ++ MESSAGE(STATUS "Doxygen wasn't found on the system") ++ MESSAGE(STATUS "") ++ ++ ENDIF(DOXYGEN_FOUND) ++ ++ELSE(BUILD_DOC) ++ ++ MESSAGE(STATUS "") ++ MESSAGE(STATUS "Documentation will NOT be installed") ++ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") ++ MESSAGE(STATUS "") ++ ++ENDIF(BUILD_DOC) + +-ENDIF(DOXYGEN_FOUND) + include(MacroOptionalAddSubdirectory) + macro_optional_add_subdirectory( po ) +diff -ruN old/digikam/CMakeLists.txt new/digikam/CMakeLists.txt +--- old/digikam/CMakeLists.txt 2010-03-28 19:19:21.000000000 -0300 ++++ new/digikam/CMakeLists.txt 2010-03-30 19:44:00.296860646 -0300 +@@ -52,7 +52,6 @@ + # specific libs and utilities + ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof + ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2 +- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf + ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack + ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg + ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine +@@ -89,6 +88,7 @@ + ${JPEG_INCLUDE_DIR} + ${PNG_PNG_INCLUDE_DIR} + ${TIFF_INCLUDE_DIR} ++ ${PGF_INCLUDE_DIRS} + ) + + IF(LENSFUN_LIBRARY) +@@ -100,9 +100,6 @@ + # Disable Clapack C code warnings. + SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") + +-# Disable libpgf warnings. +-SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") +- + # Disable liblqr C code warnings. + SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w") + +@@ -121,7 +118,6 @@ + ${libjpegutils_SRCS} + ${libthreadimageio_SRCS} + ${libthemeengine_SRCS} +- ${libpgf_SRCS} + ${pgfutils_SRCS} + ${libdigikamhelpers_SRCS} + +@@ -173,6 +169,7 @@ + ${JPEG_LIBRARIES} + ${TIFF_LIBRARIES} + ${PNG_LIBRARIES} ++ ${PGF_LIBRARIES} + ${LCMS_LIBRARIES} + ${JASPER_LIBRARIES} + +@@ -225,7 +222,6 @@ + ${libhaar_SRCS} + ${libdatabasemodels_SRCS} + ${libsqlite2_SRCS} +- ${libpgf_SRCS} + ${pgfutils_SRCS} + ) + +@@ -240,6 +236,7 @@ + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTSQL_LIBRARY} ++ ${PGF_LIBRARIES} + ) + + SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) +diff -ruN old/libs/CMakeLists.txt new/libs/CMakeLists.txt +--- old/libs/CMakeLists.txt 2010-03-28 19:19:02.000000000 -0300 ++++ new/libs/CMakeLists.txt 2010-03-30 14:03:07.365604017 -0300 +@@ -18,6 +18,7 @@ + ${JPEG_INCLUDE_DIR} + ${TIFF_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} ++ ${PGF_INCLUDE_DIRS} + ${JASPER_INCLUDE_DIR} + ) + ADD_SUBDIRECTORY( histogram ) diff --git a/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch b/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch new file mode 100644 index 000000000000..02d4cce4d34e --- /dev/null +++ b/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch @@ -0,0 +1,11 @@ +--- trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:12 1109176 ++++ trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:25 1109177 +@@ -165,7 +165,7 @@ + void RatingWidget::setFadingValue(int value) + { + d->fadingValue = value; +- if (d->fadingValue >= 255) ++ if (d->fadingValue >= 255 && d->fadingTimeLine) + { + d->fadingTimeLine->stop(); + } diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 791cc0985c71..dc2c07b9ae96 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -7,6 +7,7 @@ Add support for marble Enable support for liquid rescale tool Enable support for lens-correnction library - Allow thumbnail previews for images/photos + Enable thumbnails database support + Pull in mplayerthumbs to enable video thumbnails -- cgit v1.2.3-65-gdbad