diff options
| -rw-r--r-- | media-gfx/digikam/ChangeLog | 10 | ||||
| -rw-r--r-- | media-gfx/digikam/Manifest | 35 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-1.2.0-r2.ebuild | 94 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-1.5.0.ebuild (renamed from media-gfx/digikam/digikam-1.4.0.ebuild) | 56 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-1.2.0-libpgf.patch | 208 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-1.3.0-docs.patch | 54 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-1.5.0-unbundle.patch | 294 |
7 files changed, 366 insertions, 385 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index bb30a97ae159..7b4e53d92a13 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,14 @@ # 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.159 2010/09/25 16:40:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.160 2010/10/15 22:26:46 dilfridge Exp $ + +*digikam-1.5.0 (15 Oct 2010) + + 15 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org> + -digikam-1.2.0-r2.ebuild, -files/digikam-1.2.0-libpgf.patch, + -files/digikam-1.3.0-docs.patch, -digikam-1.4.0.ebuild, + +digikam-1.5.0.ebuild, +files/digikam-1.5.0-unbundle.patch: + Version bump; cleanup *digikam-1.2.0-r3 (25 Sep 2010) diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index d3e8e113f3d1..f76a94e89bad 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -6,38 +6,37 @@ AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c18947 AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28 AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0 AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d6d2a0e74c69923 SHA1 857589931a4c2acefcc822b664dd02ce324ea152 SHA256 0424234746611e2b75b74725e53705277308fc3596ac095013de985cc6a01622 -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 -AUX digikam-1.3.0-docs.patch 1910 RMD160 c4d644e91a0b492c8c9a8e53ed0ae19fa743dabc SHA1 6d3c6519e4d7351198f6275639afe448e09d92b7 SHA256 d8048791e9623fe99796d71bc835ac568786b4c5a643b3d02c6d80472e725b99 AUX digikam-1.3.0-pgf.patch 6006 RMD160 bfda7c95a633f4967935545f66d850fd94db9566 SHA1 43295130d7a62dc27097ed9730b3b47e13f2ab3f SHA256 84c219c7238790288b90acdb255bce2e40e3c5f19476885a2d456698e2f57205 AUX digikam-1.4.0-clapack.patch 7429 RMD160 a10cf8ff044e42cfbb3880ed543b3df0221655e6 SHA1 7cd6461ff474503124a3116b8dfd8bb264c5afb6 SHA256 1e2f1d11a612f1cff63acc46db5e5818a438d35d5aaef5b40ea6633b1f4b079e AUX digikam-1.4.0-docs.patch 1953 RMD160 c90ab96aea6e08bca963a22bee5f7868de22a708 SHA1 dbdb4ff0d4697006a12b18be1b5cf5f903b3cb70 SHA256 d4f439b2b6d86833b82c0101ed1f34cd1fc8611a4917db8ca4611437757cdce6 +AUX digikam-1.5.0-unbundle.patch 11772 RMD160 a593a67bd5d1ea02f695dc51f6240917e4f7ccdc SHA1 b989dc93f5949b1d313234d28b24b4e024d82861 SHA256 28320a7d1beb3ad8caf7fd011a93ab3f6835191183477c673c2f27662417d8ad 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 DIST digikam-1.4.0.tar.bz2 14907229 RMD160 a78656044bcc42f21794c1c4a25dcaaf869df38d SHA1 a3370f2d2c469fa5b90966bb0141b5a8956c71df SHA256 d37afaad8808f78ecda93d7498c64b72eee3bb61911fbeff87d3a528a7247eba +DIST digikam-1.5.0.tar.bz2 14131989 RMD160 2c881e8e48acccd45bb42e4f6021844c9518e528 SHA1 8cf1ba55092dbf4c64cd8b2521b4bb3ab00effe8 SHA256 5f6d2df1fc22c45c065754e43c03286fcf94145683fdb0c50f4c702546e07fef DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467 EBUILD digikam-1.1.0-r1.ebuild 2145 RMD160 8ac789bca92424a4e138b5f8d5f02445bdf43532 SHA1 0cb45162c3686b51414d6e109f721834a5adb496 SHA256 a18f53845b79ada790e740ef7f638a24cf179cf8cfd82a92adccd8694baff608 -EBUILD digikam-1.2.0-r2.ebuild 2687 RMD160 4f428f715f708428629579974db4055d4b030a00 SHA1 3804de030becf59b477c0ed3e93d0f06f7c5ac85 SHA256 91d415064f24e7b3f7445e1118d23a46fc38e68a07555c8987854f738a588923 EBUILD digikam-1.2.0-r3.ebuild 3202 RMD160 4c83dd27ed5a1b8b662d3f6795484b2e8f7f40d3 SHA1 e5cb4622b6aa3f55c51bf937931efc489a155c1a SHA256 8f0ebe79d66acf182b79dac8a6566e3c4efea07b1e82e55130fe33d5db4830bc EBUILD digikam-1.4.0-r1.ebuild 3199 RMD160 a1ce94d6113d6f081d26f90c6237f7ab5b77caed SHA1 5db566725a35c4502daa2716982e7ba12482c0a9 SHA256 e82636ed9b1a8d0e9bfb68b560cc14e7a66d5af3b64296ab8fd491d69185ce01 -EBUILD digikam-1.4.0.ebuild 2530 RMD160 d338b1aea041d969b71b688b698b6762ec6040de SHA1 213722eee8d70e925c634d49372db3a4c94cc95e SHA256 f23890f84bf2d7720c046e0a58471db8e06cac8ea883275df4ee86ede943c451 -MISC ChangeLog 26514 RMD160 345f2e5932766d6d4f7fb19882bb72764aaa2c03 SHA1 e09e13e749c80c44f0d3ea7259057c43273b6602 SHA256 2c6c651c57cdf3a4747a0903409628b44be23372c18138b518607f3be180543a +EBUILD digikam-1.5.0.ebuild 3197 RMD160 1594291d5d3462c1da0a7e90834a2dad17bf9958 SHA1 92ebb3cc64ff136d9557f6cf106c021d47b3fcbd SHA256 c38270a2b16e960df206e445abe14a96cd902111edffebf2d794fce676ed1e7f +MISC ChangeLog 26809 RMD160 00a7f8aac1ea6c4cf35ba0e1c38d754f9e3940c5 SHA1 e41b532bf2c6028ff9f3ba14b3b03ab6c63339b8 SHA256 e9cdd84d39dbc41b518ceb2487c0b3d8191a71ddeb5d812230a3fbe8dcf6bfa7 MISC metadata.xml 691 RMD160 2e1c382d4682a65909cd2820a3b997a8e27f405f SHA1 42cfc8076bba5c72e6df4650694b9ddf1b5b5bb2 SHA256 ccc5ec872df963f90005d9f2330315b4c0fc3336890464cb1f3835908a381e61 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iQIcBAEBAgAGBQJMniXoAAoJENwGBM22xffexZgP/i5B0pt1IvM2g+n427HkmxXv -wjQkznV+Rh6YpqDwmNpuURc6EqQ1V2hlnMjCUPC1uhTaKktUwag2hjuDhx54XvOp -YLR8uV/kGR+Co6BJacZI6LLUpcLIRH/YvMh6M81TsyjuCGtR+wtKZBuwcALMm56i -2vync4oKH1dIJEttiik0LdyKBOWnKetfaFIdyeDgIkrIvisPdYSosemvi3EQujqz -evFaRUC5FSV8VYJaVzrGu5ou5N5pxhJu8P+u1EzsE83/OxFrp5G2sN8Exkjkzsdn -as/uEjR9JtgvKuOByrlTfc2PzOs5ZzfsND6DBQQW7nfDNg9of5+Oa5mcQCUVBHvT -FdmTEYOxPNMLIxFyEHU7iTmId29RRxyXnVooGQNuwjWIWuSsgsiv8WDIWil2Gtm2 -bDVa0Rxct+gOF89XzPxurzf71TCwGSnbwcEY5iT7QiNb67lF3cG4ZlGI5NMeDTs2 -0sxcRVvojeoiaUrAiDWA9Ki6bnEq02XoTajHcKj04AFKtMWJtj4sZ6snm/EW5vmS -cwpcQn1GXmpfJkYFF/YGipbNvqIaA+AAr4Yi+7m9DUW2kOHuLSM6526X+d6sOa5J -gHdbVV/svpmJyCXbIZoVJkGxypyRw5F7n2umXXdg50EvYGexuFnoW7xItiFJThqw -h2DiDy1g5Ux+m7sz2JS0 -=kDH4 +iQIcBAEBAgAGBQJMuNUnAAoJENwGBM22xffeBFQP/iaYjbMx9riqKf5qooitLoZB +VmXyYhvPNAkTXl9vFVAcVOvuEoez9lOqOr4EFgRnZguQ7LxymUIgrEB3TdS5KoJo +wWAhWBPgUVOuposUuT3/5/ZsAxMelrxF0/EAnSWqNwgRRA2zkSbalZ/mN/Hi45gR +r+nSF/fSbL00o/ENuIIA1n6v/DrQrSiV1x3dCkwdWE94MM4+S5mv5HQv4qyP4HcW +Wq0yCoDeFY3XgqCriDI6G4yqdzyjXmcnrXeZvN/XuNwMk7knCaIF1N9ozaowVf5V +wkGJ747M6BKA+pN28ld4TjdLM++h7q/i1NlZ6QpL7MFTFuWYZIXda211BQfj4dN+ +sJ33pzfPNL5tuedzyf0AdO/RJxwM9SJP/dA0xR4OBBAowT1DiWg/6+aXXZboqb+Y +lvd+RdHmvASLOCGH4uGm+pvUfTs4oC9oXb3SF+v/IxbskwGHrXWBka+hqVZVaAUE +qO+qr1hluod73hSk5kNG5OeX4uElGJfhy5sfBlJGcLhI52c8Cs0crmRq4gAzmhOL +CwBR/1i9XXHSoGnCFVV2Lbl/val+mPICSSAFLoZ2SYVJpAk+1Kvy2OIj9Cwni9Hr +oJkdXtbnsGoQBoJnk/dkvnSJ2fpWRkrzUp/wfd3vhpp/YbdX4SvPeBtf6YAYmJ7Y +pFCilsg40A7I29co/62M +=YE4g -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-1.2.0-r2.ebuild b/media-gfx/digikam/digikam-1.2.0-r2.ebuild deleted file mode 100644 index 79b83040fa5d..000000000000 --- a/media-gfx/digikam/digikam-1.2.0-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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/digikam-1.4.0.ebuild b/media-gfx/digikam/digikam-1.5.0.ebuild index e119f975d578..1be86dedad07 100644 --- a/media-gfx/digikam/digikam-1.4.0.ebuild +++ b/media-gfx/digikam/digikam-1.5.0.ebuild @@ -1,11 +1,11 @@ # 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.4.0.ebuild,v 1.3 2010/09/18 20:17:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.5.0.ebuild,v 1.1 2010/10/15 22:26:46 dilfridge Exp $ EAPI="2" -KDE_LINGUAS="ar be bg ca cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km -ko lt lv nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW" +KDE_LINGUAS="ar bg ca cs da de eo et eu fi fr ga gl he hi hne hr hu is it ja km +ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_TW" KMNAME="extragear/graphics" CMAKE_MIN_VERSION=2.8 @@ -18,12 +18,14 @@ 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" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 + handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )" -LICENSE="GPL-2" +LICENSE="GPL-2 + handbook? ( FDL-1.2 )" KEYWORDS="~amd64 ~x86" SLOT="4" -IUSE="addressbook debug doc geolocation gphoto2 lensfun semantic-desktop themedesigner +thumbnails video" +IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video" CDEPEND=" >=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?] @@ -34,6 +36,7 @@ CDEPEND=" media-libs/jasper >=media-libs/jpeg-8 media-libs/lcms:0 + >=media-libs/lensfun-0.2.5 media-libs/liblqr media-libs/libpng media-libs/tiff @@ -42,11 +45,10 @@ CDEPEND=" >=sci-libs/clapack-3.2.1-r3 virtual/mysql x11-libs/qt-gui[qt3support] - x11-libs/qt-sql[mysql,sqlite] + || ( x11-libs/qt-sql[mysql] 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} @@ -63,7 +65,18 @@ DEPEND="${CDEPEND} S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/${PN}"-1.3.0-{docs,pgf}.patch "${FILESDIR}/${P}"-clapack.patch) +PATCHES=( "${FILESDIR}/${PN}"-1.4.0-docs.patch "${FILESDIR}/${P}"-unbundle.patch ) + +src_prepare() { + if use handbook; then + mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die + else + mkdir doc || die + echo > doc/CMakeLists.txt || die + fi + + kde4-base_src_prepare +} src_configure() { local backend @@ -73,13 +86,13 @@ src_configure() { mycmakeargs=( -DFORCED_UNBUNDLE=ON -DWITH_LQR=ON + -DWITH_LENSFUN=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) $(cmake-utils_use_enable themedesigner) $(cmake-utils_use_enable thumbnails THUMBS_DB) @@ -87,3 +100,26 @@ src_configure() { kde4-base_src_configure } + +src_install() { + kde4-base_src_install + + if use doc; then + # install the api documentation + dodir /usr/share/doc/${PF}/html || die + insinto /usr/share/doc/${PF}/html + doins -r ${CMAKE_BUILD_DIR}/api/html/* || die + fi + + if use handbook; then + dodoc readme-handbook.txt || die + 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 +} diff --git a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch b/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch deleted file mode 100644 index e788cf0e0055..000000000000 --- a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch +++ /dev/null @@ -1,208 +0,0 @@ -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.3.0-docs.patch b/media-gfx/digikam/files/digikam-1.3.0-docs.patch deleted file mode 100644 index 63af639597a9..000000000000 --- a/media-gfx/digikam/files/digikam-1.3.0-docs.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -r -u -N digikam-1.3.0.orig/CMakeLists.txt digikam-1.3.0/CMakeLists.txt ---- digikam-1.3.0.orig/CMakeLists.txt 2010-06-07 23:23:08.000000000 +0200 -+++ digikam-1.3.0/CMakeLists.txt 2010-07-06 21:26:53.163356449 +0200 -@@ -1334,18 +1336,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 --git a/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch b/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch new file mode 100644 index 000000000000..6d1470bb8a97 --- /dev/null +++ b/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch @@ -0,0 +1,294 @@ +diff -r -u -N digikam-1.5.0-1-docs/CMakeLists.txt digikam-1.5.0/CMakeLists.txt +--- digikam-1.5.0-1-docs/CMakeLists.txt 2010-10-12 21:14:36.000000000 +0200 ++++ digikam-1.5.0/CMakeLists.txt 2010-10-15 23:07:49.000000000 +0200 +@@ -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 +@@ -133,10 +136,12 @@ + FIND_PACKAGE(JPEG) + FIND_PACKAGE(PNG) + FIND_PACKAGE(TIFF) ++FIND_PACKAGE(PGF) + FIND_PACKAGE(Jasper) + FIND_PACKAGE(Kdcraw) + FIND_PACKAGE(Kexiv2) + FIND_PACKAGE(Kipi) ++FIND_PACKAGE(CLAPACK) + + # Extract version of libjpeg so that we can use the appropriate dir + # See bug #227313, #228483 +@@ -273,6 +278,19 @@ + PRINT_LIBRARY_STATUS("libkexiv2" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KEXIV2_FOR_DIGIKAM) + PRINT_LIBRARY_STATUS("libkdcraw" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KDCRAW_FOR_DIGIKAM) + ++IF(PGF_FOUND) ++ MESSAGE(STATUS " libpgf library found..................... YES (optional)") ++ELSE(PGF_FOUND) ++ MESSAGE(STATUS " libpgf library found..................... NO (optional - internal version used instead)") ++ENDIF(PGF_FOUND) ++ ++IF(CLAPACK_FOUND) ++ MESSAGE(STATUS " libclapack library found................. YES (optional)") ++ELSE(CLAPACK_FOUND) ++ MESSAGE(STATUS " libclapack library found................. NO (optional - internal version used instead)") ++ENDIF(CLAPACK_FOUND) ++ ++ + # ================================================================ + + IF(GPHOTO2_FOUND) +@@ -367,13 +385,19 @@ + ENDIF(DOXYGEN_FOUND) + + IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) +- MESSAGE(STATUS " digiKam will be compiled................. YES") ++ MESSAGE(STATUS " digiKam can 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_FOR_DIGIKAM 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_FOR_DIGIKAM AND KIPI_FOUND) + ++IF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND) OR (NOT LENSFUN_FOUND))) ++ MESSAGE(STATUS "") ++ MESSAGE(FATAL_ERROR " BUNDLED LIBRARIES HAVE BEEN FORCE-DISABLED IN THIS BUILD. Aborting.") ++ SET(DIGIKAM_CAN_BE_COMPILED false) ++ENDIF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND) OR (NOT LENSFUN_FOUND))) ++ + MESSAGE(STATUS "----------------------------------------------------------------------------------") + MESSAGE(STATUS "") + +@@ -585,7 +609,8 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp + ) + +- SET(libclapack_SRCS ++ if(NOT CLAPACK_FOUND) ++ 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 +@@ -618,6 +643,7 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c + ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c + ) ++ endif(NOT CLAPACK_FOUND) + + SET(libdimgfilters_SRCS + ${libclapack_SRCS} +@@ -1076,14 +1102,18 @@ + ${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 ++ IF(PGF_FOUND) ++ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) ++ ELSE(PGF_FOUND) ++ 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 + ) ++ ENDIF(PGF_FOUND) + + SET(libsqlite2_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c +diff -r -u -N digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake digikam-1.5.0/cmake/modules/FindCLAPACK.cmake +--- digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ digikam-1.5.0/cmake/modules/FindCLAPACK.cmake 2010-10-15 23:06:08.000000000 +0200 +@@ -0,0 +1,44 @@ ++# - Try to find clapack library ++# Once done this will define ++# ++# CLAPACK_FOUND - system has CLAPACK library ++# CLAPACK_INCLUDE_DIR - the CLAPACK include directory ++# CLAPACK_LIBRARY - the marblewidget library ++# ++# copyright 2008 by Patrick Spendrin <ps_ml@gmx.de> ++# copyright 2010 by Andreas K. Huettel <mail@akhuettel.de> ++# use this file as you like ++# ++ ++if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) ++ ++ # Already in cache ++ set(CLAPACK_FOUND TRUE) ++ ++else(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) ++ ++ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack NO_DEFAULT_PATH) ++ if(CLAPACK_INCLUDE_DIR) ++ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}") ++ else(CLAPACK_INCLUDE_DIR) ++ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack) ++ if(CLAPACK_INCLUDE_DIR) ++ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}") ++ endif(CLAPACK_INCLUDE_DIR) ++ endif(CLAPACK_INCLUDE_DIR) ++ ++ find_library(CLAPACK_LIBRARY clapack) ++ if(CLAPACK_LIBRARY) ++ message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}") ++ endif(CLAPACK_LIBRARY) ++ ++ if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) ++ set(CLAPACK_FOUND TRUE) ++ endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) ++ ++ if(NOT CLAPACK_FOUND) ++ message(STATUS "Could NOT find any working clapack installation") ++ endif(NOT CLAPACK_FOUND) ++ ++ mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY) ++endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) +diff -r -u -N digikam-1.5.0-1-docs/cmake/modules/FindPGF.cmake digikam-1.5.0/cmake/modules/FindPGF.cmake +--- digikam-1.5.0-1-docs/cmake/modules/FindPGF.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ digikam-1.5.0/cmake/modules/FindPGF.cmake 2010-10-15 23:05:52.000000000 +0200 +@@ -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 -r -u -N digikam-1.5.0-1-docs/digikam/CMakeLists.txt digikam-1.5.0/digikam/CMakeLists.txt +--- digikam-1.5.0-1-docs/digikam/CMakeLists.txt 2010-10-10 21:37:09.000000000 +0200 ++++ digikam-1.5.0/digikam/CMakeLists.txt 2010-10-15 23:06:08.000000000 +0200 +@@ -53,8 +53,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 + ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface +@@ -94,13 +92,29 @@ + ${TIFF_INCLUDE_DIR} + ) + +-# Shared libdigikamcore ################################################################ ++IF(PGF_FOUND) ++ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) ++ELSE(PGF_FOUND) ++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf) ++ENDIF(PGF_FOUND) ++ ++IF(CLAPACK_FOUND) ++ INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR}) ++ELSE(CLAPACK_FOUND) ++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack) ++ENDIF(CLAPACK_FOUND) + +-# Disable Clapack C code warnings. +-SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") ++# Shared libdigikamcore ################################################################ + +-# Disable libpgf warnings. +-SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") ++IF(NOT CLAPACK_FOUND) ++ # Disable Clapack C code warnings. ++ SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") ++ENDIF(NOT CLAPACK_FOUND) ++ ++IF(NOT PGF_FOUND) ++ # Disable libpgf warnings. ++ SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") ++ENDIF(NOT PGF_FOUND) + + # Disable liblqr C code warnings. + SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w") +@@ -187,10 +201,18 @@ + ${KIPI_LIBRARIES} + ) + ++IF(PGF_FOUND) ++ TARGET_LINK_LIBRARIES(digikamcore ${PGF_LIBRARIES}) ++ENDIF(PGF_FOUND) ++ + IF(MARBLEWIDGET_FOUND) + TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY}) + ENDIF(MARBLEWIDGET_FOUND) + ++IF(CLAPACK_FOUND) ++ TARGET_LINK_LIBRARIES(digikamcore ${CLAPACK_LIBRARY}) ++ENDIF(CLAPACK_FOUND) ++ + IF(Q_WS_X11) + TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES}) + ENDIF(Q_WS_X11) +@@ -241,6 +263,10 @@ + ${QT_QTSQL_LIBRARY} + ) + ++IF(PGF_FOUND) ++ TARGET_LINK_LIBRARIES(digikamdatabase ${PGF_LIBRARIES}) ++ENDIF(PGF_FOUND) ++ + SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) + INSTALL(TARGETS digikamdatabase ${INSTALL_TARGETS_DEFAULT_ARGS} ) + +@@ -339,6 +365,10 @@ + TARGET_LINK_LIBRARIES(digikam ${LIBMARBLEWIDGET_LIBRARY}) + ENDIF(MARBLEWIDGET_FOUND) + ++IF(CLAPACK_FOUND) ++ TARGET_LINK_LIBRARIES(digikam ${CLAPACK_LIBRARY}) ++ENDIF(CLAPACK_FOUND) ++ + INSTALL(TARGETS digikam ${INSTALL_TARGETS_DEFAULT_ARGS}) + + # Others Files to install ####################################################### +diff -r -u -N digikam-1.5.0-1-docs/libs/CMakeLists.txt digikam-1.5.0/libs/CMakeLists.txt +--- digikam-1.5.0-1-docs/libs/CMakeLists.txt 2010-10-10 21:36:54.000000000 +0200 ++++ digikam-1.5.0/libs/CMakeLists.txt 2010-10-15 23:05:52.000000000 +0200 +@@ -21,6 +21,10 @@ + ${JASPER_INCLUDE_DIR} + ) + ++IF(PGF_FOUND) ++ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) ++ENDIF(PGF_FOUND) ++ + ADD_SUBDIRECTORY( histogram ) + ADD_SUBDIRECTORY( dmetadata ) + ADD_SUBDIRECTORY( dimg ) +diff -r -u -N digikam-1.5.0-1-docs/showfoto/CMakeLists.txt digikam-1.5.0/showfoto/CMakeLists.txt +--- digikam-1.5.0-1-docs/showfoto/CMakeLists.txt 2010-10-10 21:37:10.000000000 +0200 ++++ digikam-1.5.0/showfoto/CMakeLists.txt 2010-10-15 23:06:09.000000000 +0200 +@@ -65,6 +65,10 @@ + + KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS}) + ++IF(CLAPACK_FOUND) ++ TARGET_LINK_LIBRARIES(showfoto ${CLAPACK_LIBRARY}) ++ENDIF(CLAPACK_FOUND) ++ + TARGET_LINK_LIBRARIES(showfoto + digikamcore + ${KEXIV2_LIBRARIES} |