commit: 90b6e5146c56d3c204b5326b7bc59175a9d1e0af
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 2 13:38:05 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 3 19:17:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=90b6e514
[media-plugins/kipi-plugins] Add kf5 version
Package-Manager: portage-2.2.20
.../files/kipi-plugins-5.0.0-expoblending.patch | 16 ++
.../files/kipi-plugins-5.0.0-jpeg.patch | 14 ++
.../kipi-plugins/kipi-plugins-5.9999.ebuild | 185 +++++++++++++++++++++
media-plugins/kipi-plugins/metadata.xml | 1 +
4 files changed, 216 insertions(+)
diff --git
a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
new file mode 100644
index 0000000..33fcb33
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt 2015-08-02 14:04:46.650113184 +0200
++++ b/CMakeLists.txt 2015-08-02 14:06:44.499115207 +0200
+@@ -312,9 +312,12 @@
+ add_subdirectory(sendimages)
+ add_subdirectory(timeadjust)
+ add_subdirectory(flashexport)
+- add_subdirectory(expoblending)
+ add_subdirectory(metadataedit)
+
++ if(ENABLE_expoblending)
++ add_subdirectory(expoblending)
++ endif()
++
+ if(KF5Sane_FOUND)
+ add_subdirectory(acquireimages)
+ endif()
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-jpeg.patch
b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-jpeg.patch
new file mode 100644
index 0000000..72b3862
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-jpeg.patch
@@ -0,0 +1,14 @@
+diff -u -r
a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp
b/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp
+--- a/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-16
09:54:40.000000000 +0200
++++ b/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-24
20:46:51.471208340 +0200
+@@ -181,8 +181,8 @@
+ cinfo.comp_info[2].v_samp_factor = 1;
+
+ // bug #154273: use 99 compression level instead 100 to reduce output
JPEG file size.
+- jpeg_set_quality(&cinfo, 99, true);
+- jpeg_start_compress(&cinfo, true);
++ jpeg_set_quality(&cinfo, 99, boolean (true));
++ jpeg_start_compress(&cinfo, boolean(true));
+
+ // Write ICC color profile.
+ if (!d->iccProfile.isEmpty())
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.9999.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-5.9999.ebuild
new file mode 100644
index 0000000..b75932e
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-5.9999.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+#
+# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for
work in progress
+#
+
+EAPI=5
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+KDE_HANDBOOK=true
+KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa
+fi fo fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi
+mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv
+ta te tg th tr tt uk uz ven vi wa xh zh_CN zh_HK zh_TW zu"
+fi
+
+EGIT_BRANCH=frameworks
+KDE_TEST=true
+inherit flag-o-matic kde5
+
+MY_PV=${PV/_/-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="http://www.digikam.org/";
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="cdr calendar expoblending geolocator +imagemagick mediawiki opengl
panorama scanner vkontakte"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ LICENSE="${LICENSE} handbook? ( FDL-1.2 )"
+ MY_PV=${PV/_/-}
+ MY_P="digikam-${MY_PV}"
+ SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+ S=${WORKDIR}/${MY_P}/extra/${PN}
+fi
+
+# TODO: Add back when ported
+# dev-libs/libxml2
+# dev-libs/libxslt
+# crypt? ( app-crypt/qca:2[qt5(+)] )
+# redeyes? ( >=media-libs/opencv-2.4.9 )
+# videoslideshow? (
+# >=media-libs/qt-gstreamer-0.9.0[qt5(+)]
+# || ( media-gfx/imagemagick
media-gfx/graphicsmagick[imagemagick] )
+# )
+# FIXME? media-libs/herqq not optional since >=5.0.0
+
+COMMONDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep threadweaver)
+ dev-libs/qjson
+ dev-qt/qtconcurrent:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5
+ kde-apps/libkdcraw:5=
+ kde-apps/libkexiv2:5=
+ kde-apps/libkipi:5=
+ media-libs/herqq
+ media-libs/libpng:0=
+ media-libs/tiff:0
+ virtual/jpeg:0
+ calendar? ( $(add_kdeapps_dep kcalcore) )
+ geolocator? (
+ $(add_frameworks_dep kbookmarks)
+ $(add_kdeapps_dep libkgeomap)
+ )
+ mediawiki? ( net-libs/libmediawiki:5 )
+ opengl? (
+ dev-qt/qtopengl:5
+ media-libs/phonon[qt5]
+ x11-libs/libXrandr
+ virtual/opengl
+ )
+ scanner? (
+ $(add_kdeapps_dep libksane)
+ media-gfx/sane-backends
+ )
+ vkontakte? ( net-libs/libkvkontakte:5 )
+"
+DEPEND="${COMMONDEPEND}
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+RDEPEND="${COMMONDEPEND}
+ !media-plugins/kipi-plugins:4
+ cdr? ( app-cdr/k3b )
+ expoblending? ( media-gfx/hugin )
+ imagemagick? ( || ( media-gfx/imagemagick
media-gfx/graphicsmagick[imagemagick] ) )
+ panorama? (
+ media-gfx/enblend
+ >=media-gfx/hugin-2011.0.0
+ )
+"
+
+RESTRICT=test
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.0.0-expoblending.patch"
+ "${FILESDIR}/${PN}-5.0.0-jpeg.patch"
+)
+
+src_prepare() {
+ undetect_lib() {
+ local _use=${1}
+ local _name=${2}
+ [[ -z ${_name} ]] && _name=$(echo ${_use} | sed 's/./\U&/g')
+ use $_use || \
+ sed -i -e "/DETECT_LIB${_name}/d" CMakeLists.txt || die
+ }
+
+ undetect_lib geolocator KGEOMAP
+ undetect_lib mediawiki
+ undetect_lib scanner KSANE
+ undetect_lib vkontakte KVKONTAKTE
+
+# if ! use redeyes ; then
+# sed -i -e "/DETECT_OPENCV/d" CMakeLists.txt || die
+# fi
+
+ if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ # prepare the handbook
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" \
+ "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
+ if use handbook; then
+ echo "add_subdirectory( doc )" >> CMakeLists.txt
+ fi
+
+ # prepare the translations
+ mv "${WORKDIR}/${MY_P}/po" po || die
+ find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm
{} +
+ echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
+ echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+ echo "add_subdirectory( po )" >> CMakeLists.txt
+ fi
+
+ kde5_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs+=(
+ $(cmake-utils_use_enable expoblending)
+ $(cmake-utils_use_find_package calendar KF5CalendarCore)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package panorama BISON)
+ $(cmake-utils_use_find_package panorama FLEX)
+ )
+# TODO: Add back when ported
+# $(cmake-utils_use_find_package redeyes OpenCV)
+# $(cmake-utils_use_with crypt QCA2)
+# $(cmake-utils_use_with videoslideshow QtGStreamer)
+# FIXME? not optional since >=5.0.0
+# $(cmake-utils_use_with upnp Hupnp)
+
+ kde5_src_configure
+}
diff --git a/media-plugins/kipi-plugins/metadata.xml
b/media-plugins/kipi-plugins/metadata.xml
index 74966c6..61950f1 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="expoblending">Build the expoblending plugin, which
requires media-gfx/hugin</flag>
<flag name="gpssync">Build the gpssync plugin, which requires
media-lib/libkgeomap and thereby marble</flag>
+ <flag name="geolocator">Build the geolocator plugin, which
requires kde-apps/libkgeomap and thereby marble</flag>
<flag name="mediawiki">Build the mediawiki export plugin</flag>
<flag name="panorama">Pull in dependencies needed by panorama
plugin</flag>
<flag name="redeyes">Add redeyes removal support</flag>
