# ChangeLog for media-gfx/digikam
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.188 2011/07/05 11:39:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.189 2011/07/27 20:51:56 dilfridge Exp $
+
+*digikam-2.0.0_rc (27 Jul 2011)
+
+ 27 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-officialpgf.patch,
+ +files/digikam-2.0.0_rc-officialpgf2.patch,
+ +files/digikam-2.0.0_rc-oldpgf.patch, metadata.xml:
+ Version bump
05 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch:
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adcb1caee4407b SHA1 3bb97db282fbb0c50e03cd4ba6c5ac6821558620 SHA256 9ca068c87868b9709d75441795bfff2790d13957354b675a9aa94d5f3d55eca8
AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc
+AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda
+AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f311028bc6dc9643 SHA1 8d170abfebddbf1d4f146d6c0b568f2a6262466a SHA256 0f3f010da6f7230ef865169db58f8595796354726b5599e975fde42af4fecbd5
+AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
+DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
-MISC ChangeLog 31402 RMD160 e7c0bda3134c1213a330b034eeee989d6ae3d996 SHA1 0d429761f4cf569a82efa97ebb2d0a372be4ff33 SHA256 c68a056565cba76633accee95a6065682845ecf9e5c1e621368a713c2e1d779a
-MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
+EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d1674672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955af12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a
+MISC ChangeLog 31679 RMD160 a84de3e0b6314ae2c661965580c9ef6f67875360 SHA1 97ae54bdbace08d81db446e44a4e81e332bb32f7 SHA256 0ddc033e7ef45cdc2555adf2007741df5badb9a19e69347e67daa1aa43f5e1e5
+MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOMHpyAAoJENwGBM22xffeq8AP/12ngKs4atdD7FN2sDIU9Jc/
+IIbhM1Wv378SppZAfh7h9GmqUax+uG3eRRtuA5M0FAP71XlGrSxchvnYMUjZcTyi
+wXjpMDgbL1JxiWphYco3nxh1N9q/r2/GJNQaTWEijnRhN2ebFzbzP8kP5yl90XuM
+4wag+SWujHQnvx/Tl50azxwEoISgyQeY81mGgipAPvs7kK20zqJalfqxlQfzKPyH
+928D2+bcboCOBA9pswKfyFOGF13J8CgvIKHNgsQEsj7N0VxDjzLqckcBLa0WYS1a
+JlS81+4VdD72mnt+fYmzbvIQlZeIj8DJo9A6gWg9tJTW4x9cU4htLEUadQ8I6mRd
+aVK9U6ACBaC1i75hBawNz5WBncZITj2lj97ljGBaFvH9WHftVdzDS1dCjQfTSUb5
+/3TBHtEk5ZVC6RbVbUn+Tbz05U5S2cSsbU50stgcMmexboRe3SuD00jpZ5TCAa6x
+wDTVNHhtR5geBKKT6T/V7C5nBHGhPKrO8CZb+JcoqsjW1V/oSM/m01mDOweGgpU5
+Mvq/YktTpgqcEpFCMkz7FIxPy0XChw9P8Frx8qBqh5okYxzKfiN+3a04GfGE8675
++JL6gW1q4ojEwIrSSdUWHk7B57e05NhzHfK0k0+U/sjAMNG+x59dibTnDkBLcsIX
+a+M9KB79Pw8AqFy6ba1E
+=AjRC
+-----END PGP SIGNATURE-----
--- /dev/null
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $
+
+EAPI=4
+
+KDE_LINGUAS=""
+#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
+# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+#the release candidate has no internationalization
+
+KDE_HANDBOOK="optional"
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.7"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Digital photo management application for KDE"
+HOMEPAGE="http://www.digikam.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+ $(add_kdebase_dep kdelibs semantic-desktop)
+ $(add_kdebase_dep libkdcraw)
+ $(add_kdebase_dep libkexiv2)
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep marble plasma)
+ $(add_kdebase_dep solid)
+ media-libs/jasper
+ media-libs/lcms:0
+ >=media-libs/lensfun-0.2.5
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkmap-${PV}
+ media-libs/liblqr
+ >=media-libs/libpgf-6.11.24
+ media-libs/libpng
+ media-libs/tiff
+ media-plugins/kipi-plugins
+ virtual/jpeg
+ x11-libs/qt-gui[qt3support]
+ || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ gphoto2? ( media-libs/libgphoto2 )
+ mysql? ( virtual/mysql )
+"
+RDEPEND="${CDEPEND}
+ $(add_kdebase_dep kreadconfig)
+ video? (
+ || (
+ $(add_kdebase_dep mplayerthumbs)
+ $(add_kdebase_dep ffmpegthumbs)
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch"
+ "${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch"
+ "${FILESDIR}/${PN}-2.0.0_rc-officialpgf2.patch"
+)
+
+S="${WORKDIR}/${MY_P}/core"
+
+src_prepare() {
+ # just to make absolutely sure
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+ echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+ echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+ kde4-base_src_prepare
+
+ if use handbook; then
+ echo "add_subdirectory( doc )" >> CMakeLists.txt
+ fi
+}
+
+src_configure() {
+ local backend
+
+ use semantic-desktop && backend="Nepomuk" || backend="None"
+ # LQR = only allows to choose between bundled/external
+ local mycmakeargs=(
+ -DFORCED_UNBUNDLE=ON
+ -DWITH_LQR=ON
+ -DWITH_LENSFUN=ON
+ -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
+ $(cmake-utils_use_with addressbook KdepimLibs)
+ -DWITH_MarbleWidget=ON
+ $(cmake-utils_use_enable gphoto2 GPHOTO2)
+ $(cmake-utils_use_with gphoto2)
+ $(cmake-utils_use_with semantic-desktop Soprano)
+ $(cmake-utils_use_enable themedesigner)
+ $(cmake-utils_use_enable thumbnails THUMBS_DB)
+ $(cmake-utils_use_enable mysql INTERNALMYSQL)
+ $(cmake-utils_use_enable debug DEBUG_MESSAGES)
+ )
+
+ kde4-base_src_configure
+}
+
+src_compile() {
+ local mytargets="all"
+ use doc && mytargets+=" doc"
+
+ kde4-base_src_compile ${mytargets}
+}
+
+src_install() {
+ kde4-base_src_install
+
+ if use doc; then
+ # install the api documentation
+ insinto /usr/share/doc/${PF}/html
+ doins -r ${CMAKE_BUILD_DIR}/api/html/*
+ fi
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ if use doc; then
+ elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
+ fi
+}
--- /dev/null
+diff -ruN digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake
+--- digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake 2011-06-28 16:38:50.000000000 +0200
++++ digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake 2011-07-04 15:32:50.000000000 +0200
+@@ -1,9 +1,10 @@
+ # - 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
++# PGF_FOUND - system has libgf
++# PGF_INCLUDE_DIRS - the libpgf include directory
++# PGF_LIBRARIES - Link these to use libpgf
++# PGF_CODEC_VERSION_ID - PGF codec version ID.
+
+ # PKG-CONFIG is required.
+ INCLUDE(FindPkgConfig REQUIRED)
+@@ -12,4 +13,15 @@
+ INCLUDE(FindPkgConfig)
+
+ PKG_CHECK_MODULES(PGF libpgf)
++
++ MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}")
++ MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}")
++ MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}")
++ MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}")
++ MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}")
++ MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}")
++
++ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}")
++ MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}")
++
+ ENDIF(PKG_CONFIG_FOUND)
+diff -ruN digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake
+--- digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake 2011-06-28 16:38:50.000000000 +0200
++++ digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake 2011-07-04 15:29:24.000000000 +0200
+@@ -57,6 +57,8 @@
+ /* Define to 1 if we know how to start mysqld */
+ #cmakedefine HAVE_INTERNALMYSQL 1
+
++#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
++
+ #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
+
+ /*
+diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp
+--- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp 2011-06-28 16:38:44.000000000 +0200
++++ digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp 2011-07-04 15:29:24.000000000 +0200
+@@ -46,6 +46,7 @@
+ // LibPGF includes
+
+ #include "PGFimage.h"
++#include "config-digikam.h"
+
+ namespace Digikam
+ {
--- /dev/null
+diff -ruN digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp
+--- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp 2011-06-28 16:38:45.000000000 +0200
++++ digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp 2011-07-05 13:50:20.036746353 +0200
+@@ -29,6 +29,7 @@
+ //#define ENABLE_DEBUG_MESSAGES
+
+ #include "pgfloader.h"
++#include "config-digikam.h"
+
+ // C Ansi includes
+
+@@ -435,10 +436,8 @@
+ CallbackForLibPGF, this);
+
+ UINT32 nWrittenBytes = 0;
+-#ifdef PGFCodecVersionID
+-# if PGFCodecVersionID >= 0x061124
++#if PGFCodecVersionID >= 0x061124
+ pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this);
+-# endif
+ #else
+ pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this);
+ #endif
--- /dev/null
+commit 1f80f35b68702136ebd3d315fe4baf7d75b3c142
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Sun Jul 3 10:57:21 2011 +0200
+
+ compile with libpgf 6.09.44
+ BUGS: 276969
+
+diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp
+index 2b5829f..758f12c 100644
+--- a/libs/threadimageio/pgfutils.cpp
++++ b/libs/threadimageio/pgfutils.cpp
+@@ -151,7 +151,14 @@ bool writePGFImageData(const QImage& img, QByteArray& data, int quality)
+ // TODO : optimize memory allocation...
+ CPGFMemoryStream stream(256000);
+ UINT32 nWrittenBytes = 0;
++
++#ifdef PGFCodecVersionID
++# if PGFCodecVersionID >= 0x061124
+ pgfImg.Write(&stream, &nWrittenBytes);
++# endif
++#else
++ pgfImg.Write(&stream, 0, 0, &nWrittenBytes);
++#endif
+
+ data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes);
+
<use>
<flag name="addressbook">Add support for kdepim</flag>
<flag name="geolocation">Add support for marble</flag>
- <flag name="lensfun">Enable support for lens-correnction library</flag>
<flag name="themedesigner">Build the digikam theme designer</flag>
<flag name="thumbnails">Enable thumbnails database support</flag>
<flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
projects / gentoo.git / commitdiff