aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-07-27 22:52:30 +0200
committerAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-07-27 22:52:30 +0200
commitf5ac6b5ba8a7efe14b390b0c0827d56d289c0dea (patch)
tree4ee9e4b768129457c3b32a4fdfb4bc83e2f768f4 /media-gfx
parent[media-libs/libmediawiki] Moved to main tree (diff)
downloadkde-f5ac6b5ba8a7efe14b390b0c0827d56d289c0dea.tar.gz
kde-f5ac6b5ba8a7efe14b390b0c0827d56d289c0dea.tar.bz2
kde-f5ac6b5ba8a7efe14b390b0c0827d56d289c0dea.zip
[media-gfx/digikam] Moved to main tree
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/digikam/Manifest8
-rw-r--r--media-gfx/digikam/digikam-2.0.0_beta6.ebuild136
-rw-r--r--media-gfx/digikam/digikam-2.0.0_rc.ebuild140
-rw-r--r--media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch56
-rw-r--r--media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch23
-rw-r--r--media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch26
-rw-r--r--media-gfx/digikam/metadata.xml12
7 files changed, 0 insertions, 401 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
deleted file mode 100644
index cd45ab7abc..0000000000
--- a/media-gfx/digikam/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea
-DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691
-EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-EBUILD digikam-2.0.0_rc.ebuild 3370 RMD160 58668a86e9f0fa77cf9d9ea6a39917616e207912 SHA1 8e567e80d44070618bb46de55d75ca1160321f70 SHA256 ffd574d11ee097c8eb4e2eb05e67095c870741ccb0292ef2dca7d3795c7bcfc5
-MISC metadata.xml 497 RMD160 73141e1fd45de59b199e7c4a2a1622f6c9dac130 SHA1 664d9d8b9b1953e0f6aa3130f61138cbc207a2bf SHA256 1ec09a52e4d5c3a6bd12993b7903663c10f57c8549686189a6a7b5d297bc7d24
diff --git a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
deleted file mode 100644
index be5c2a80ff..0000000000
--- a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.30"
-# please leave the weird number here for the moment
-
-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="~amd64 ~x86"
-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-r6 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 )
-"
-
-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 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
-}
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
deleted file mode 100644
index 12bade4360..0000000000
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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
-
-KDEGRAPHICS_MINIMAL="4.6.31"
-# please leave the weird number here for the moment
-
-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="~amd64 ~x86"
-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-6.11.24
- >=media-plugins/kipi-plugins-1.2.0-r1
- || ( >=sci-libs/clapack-3.2.1-r6 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_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 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
-}
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch
deleted file mode 100644
index 78f7770533..0000000000
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
- {
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch
deleted file mode 100644
index 184360d997..0000000000
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
deleted file mode 100644
index c60a7e30b0..0000000000
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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);
-
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
deleted file mode 100644
index 23f6f4d2e2..0000000000
--- a/media-gfx/digikam/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>