From: "Andreas K. Huettel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
Date: Fri, 20 May 2011 22:55:07 +0000 (UTC) [thread overview]
Message-ID: <ada230f1c25133376e3966d40a216945e375c26f.dilfridge@gentoo> (raw)
commit: ada230f1c25133376e3966d40a216945e375c26f
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri May 20 23:15:17 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 20 23:15:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ada230f1
[media-gfx/digikam] Beta version depending on kde-4.7
(Portage version: 2.1.9.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/digikam-2.0.0_beta5.ebuild | 132 ++++++++++++++++++++
media-gfx/digikam/files/digikam-1.9.0-turbo.patch | 56 ++++++++
.../digikam/files/digikam-2.0.0_beta5-docs.patch | 42 ++++++
media-gfx/digikam/metadata.xml | 12 ++
4 files changed, 242 insertions(+), 0 deletions(-)
diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
new file mode 100644
index 0000000..9a8f9e2
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
@@ -0,0 +1,132 @@
+# 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-1.6.0.ebuild,v 1.1 2010/11/25 20:30:29 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"
+
+KDE_HANDBOOK="optional"
+
+CMAKE_MIN_VERSION=2.8
+
+KDE_MINIMAL="4.6"
+KDEGRAPHICS_MINIMAL="4.6.29"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A 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=""
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+ $(add_kdebase_dep kdelibs semantic-desktop)
+ $(add_kdebase_dep marble plasma)
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep libkexiv2)
+ >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkmap-${PV}
+ $(add_kdebase_dep solid)
+ media-libs/jasper
+ virtual/jpeg
+ media-libs/lcms:0
+ >=media-libs/lensfun-0.2.5
+ media-libs/liblqr
+ media-libs/libpng
+ media-libs/tiff
+ media-libs/libpgf
+ >=media-plugins/kipi-plugins-1.2.0-r1
+ || ( >=sci-libs/clapack-3.2.1-r3 sci-libs/lapack-atlas )
+ virtual/mysql
+ x11-libs/qt-gui[qt3support]
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ gphoto2? ( media-libs/libgphoto2 )
+"
+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_beta5-docs.patch
+ "${FILESDIR}/${PN}"-1.9.0-turbo.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)
+ $(cmake-utils_use_build doc)
+ -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)
+ )
+
+ kde4-base_src_configure
+}
+
+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
+}
diff --git a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch b/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
new file mode 100644
index 0000000..bd10552
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
@@ -0,0 +1,56 @@
+From 1ad9ae102ea1a82a72e31401fe840954a791219f Mon Sep 17 00:00:00 2001
+From: Riccardo Iaconelli <riccardo@kde.org>
+Date: Sun, 15 May 2011 16:18:44 +0200
+Subject: [PATCH] Don't fail CMake check: compile with libjpeg-turbo
+
+Patch by Rex Dieter
+
+BUG: 265431
+
+Signed-off-by: Riccardo Iaconelli <riccardo@kde.org>
+---
+ CMakeLists.txt | 28 +++++++++++++++++-----------
+ 1 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 43293ef..63402e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -166,17 +166,23 @@ ELSE(NOT APPLE)
+ SET(CLAPACK_FOUND FALSE)
+ ENDIF(NOT APPLE)
+
+-# Extract version of libjpeg so that we can use the appropriate dir
+-# See bug #227313, #228483
+-FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
+-STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
+-MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}")
+-
+-IF ("${jpeglib_version}" LESS 80)
+- SET(DIGIKAM_LIBJPEG_DIR libjpeg-62)
+-ELSE ("${jpeglib_version}" LESS 80)
+- SET(DIGIKAM_LIBJPEG_DIR libjpeg-80)
+-ENDIF ("${jpeglib_version}" LESS 80)
++# check version of libjpeg so that we can use the appropriate dir
++# See bug #227313
++set(_jpeglib_version_source "#include <stddef.h>\n#include<stdio.h>\n#include <jpeglib.h>\n int main()\n {\n #if (JPEG_LIB_VERSION >= 80) \n #error JPEG_LIB_VERSION >= 80 found \n #endif \n }\n")
++set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpeglib_version_check.cpp)
++file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source}")
++set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${JPEG_INCLUDE_DIR}")
++
++try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var)
++
++if(_jpeglib_version_compile_result)
++MESSAGE(STATUS "Identified libjpeg version: 62")
++set(DIGIKAM_LIBJPEG_DIR libjpeg-62)
++else(_jpeglib_version_compile_result)
++MESSAGE(STATUS "Identified libjpeg version: 80+")
++set(DIGIKAM_LIBJPEG_DIR libjpeg-80)
++endif(_jpeglib_version_compile_result)
++
+
+ IF (ENABLE_INTERNALMYSQL)
+ # Check MySQL executables
+--
+1.7.3.4
+
diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
new file mode 100644
index 0000000..a5bc184
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
@@ -0,0 +1,42 @@
+diff -ruN digikam-2.0.0-beta5.orig/core/CMakeLists.txt digikam-2.0.0-beta5/core/CMakeLists.txt
+--- digikam-2.0.0-beta5.orig/core/CMakeLists.txt 2011-05-04 10:52:35.000000000 +0200
++++ digikam-2.0.0-beta5/core/CMakeLists.txt 2011-05-11 22:40:30.000000000 +0200
+@@ -1560,8 +1560,15 @@
+ # ==================================================================================================
+ # API documentation generation
+
++# Checks if user ask to build documentation.
++IF(BUILD_DOC)
++
+ IF(DOXYGEN_FOUND)
+
++ MESSAGE(STATUS "")
++ MESSAGE(STATUS "API 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)
+@@ -1569,7 +1576,21 @@
+
+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
+
+- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
++ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
++
++ELSE(DOXYGEN_FOUND)
++
++ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
++
+ ENDIF(DOXYGEN_FOUND)
+
++ELSE(BUILD_DOC)
++
++
++ MESSAGE(STATUS "")
++ MESSAGE(STATUS "Documentation will NOT be installed, because")
++ MESSAGE(STATUS "the option -DBUILD_DOC=ON wasn't passed to cmake")
++ MESSAGE(STATUS "")
++
++ENDIF(BUILD_DOC)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
new file mode 100644
index 0000000..23f6f4d
--- /dev/null
+++ b/media-gfx/digikam/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<maintainer><email>dilfridge@gentoo.org</email></maintainer>
+<use>
+ <flag name="addressbook">Add support for kdepim</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>
+</use>
+</pkgmetadata>
next reply other threads:[~2011-05-20 22:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-20 22:55 Andreas K. Huettel [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-06-03 21:18 [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ Andreas Hüttel
2011-07-03 9:27 Andreas Hüttel
2011-07-05 7:11 Andreas Hüttel
2011-07-05 12:03 Andreas Hüttel
2011-07-27 20:52 Andreas Hüttel
2012-08-10 18:27 Chris Reffett
2012-08-11 15:08 Andreas Hüttel
2012-09-19 19:07 Andreas Hüttel
2012-09-19 19:13 Andreas Hüttel
2012-11-10 23:33 Andreas Hüttel
2020-04-19 7:59 Andreas Sturmlechner
2020-05-26 15:12 Andreas Sturmlechner
2022-01-18 16:01 Andreas Sturmlechner
2023-07-08 14:54 Andreas Sturmlechner
2023-12-25 21:53 Andreas Sturmlechner
2024-03-25 14:43 Andreas Sturmlechner
2024-07-13 21:57 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ada230f1c25133376e3966d40a216945e375c26f.dilfridge@gentoo \
--to=dilfridge@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox