# 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 <reavertm@gentoo.org>
+ +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 <ssuominen@gentoo.org>
digikam-1.1.0-r1.ebuild:
AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
+AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0
+AUX digikam-1.2.0-libpgf.patch 8505 RMD160 524cfb182518f45e6d2a683642486eb84a3471d3 SHA1 d86fec9b63442f472d0ce7dd0d20939fe389eadc SHA256 8c603858103f056d17d4e8d9a3cb1d6464de6d174d82ff50882611e27564f465
+AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
DIST digikam-1.1.0-libjpeg-8a.patch.bz2 14552 RMD160 8ecf249a0e4db45ccd13b7013b543483cb1a7af5 SHA1 137402f1727f8fcb76f38c33ad1ba0ae036e298e SHA256 c728940524ef7089c842319134aa3346de154e546f8dbf5f2b9d3a7096c33456
DIST digikam-1.1.0.tar.bz2 15385611 RMD160 a4bd749adf24be7cd349e7be464cf22018d21eca SHA1 5ee482ff209c0a29b898e57278d62c428b743ba5 SHA256 6d26921e83bdb85342a0455df919f33bc2f23533c96e9293e80cd79ff92bfa8f
+DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
EBUILD digikam-1.1.0-r1.ebuild 2145 RMD160 8ac789bca92424a4e138b5f8d5f02445bdf43532 SHA1 0cb45162c3686b51414d6e109f721834a5adb496 SHA256 a18f53845b79ada790e740ef7f638a24cf179cf8cfd82a92adccd8694baff608
-MISC ChangeLog 25002 RMD160 77ebdc59fc9e1c00659d12eb0067a7518f8fde21 SHA1 e816240272d72eb36cb396d216777452ab9979bd SHA256 0d4a504c84fd48c4d83578d5deb49af5795ed7d2ce2c6eded5915c87302d1a99
-MISC metadata.xml 494 RMD160 6139d5c9cfa6c7c1295682cc4094b1138a3d4197 SHA1 d5d698ce43d3089bc3c9dd0a6eb989d89766062e SHA256 8fb9939a7dec954094ab4dea687e3be5a8486295e201124fc4192f32d4526de1
+EBUILD digikam-1.2.0-r2.ebuild 2687 RMD160 4f428f715f708428629579974db4055d4b030a00 SHA1 3804de030becf59b477c0ed3e93d0f06f7c5ac85 SHA256 91d415064f24e7b3f7445e1118d23a46fc38e68a07555c8987854f738a588923
+MISC ChangeLog 25337 RMD160 2143d24e4f9d63bb688900bf603f12ffa7605e32 SHA1 2f09165aca23ddaf30c444cada90463ebbdc32dc SHA256 be90ef17d56313b8a8652237f92ff7934e04e809b8d2a7f5f76481e190750790
+MISC metadata.xml 562 RMD160 188fb8388578c167401790a089e059d7a23303ae SHA1 e7882d5de84b534b1c0ebcf8afc14c1f7d137b98 SHA256 b806a8f3e029ca8593ed1966024e6e5392e3382d06a87d5dc05ee1ecac536a79
--- /dev/null
+# 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
+}
--- /dev/null
+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 )
--- /dev/null
+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 )
--- /dev/null
+--- 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();
+ }
<flag name="geolocation">Add support for marble</flag>
<flag name="glib">Enable support for liquid rescale tool</flag>
<flag name="lensfun">Enable support for lens-correnction library</flag>
- <flag name="thumbnails">Allow thumbnail previews for images/photos</flag>
+ <flag name="thumbnails">Enable thumbnails database support</flag>
+ <flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
</use>
</pkgmetadata>
projects / gentoo.git / commitdiff