commit: 57c3fb7e5b974a6fd55b6e35b2ddf7e556558add
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 1 19:10:23 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 3 19:11:30 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=57c3fb7e
[media-plugins/kipi-plugins] Version bump
Package-Manager: portage-2.2.20
.../files/kipi-plugins-4.10.0-jpeg.patch | 76 +++++++++++
.../files/kipi-plugins-4.6.0-options.patch | 24 ++++
.../kipi-plugins/kipi-plugins-4.12.0.ebuild | 150 +++++++++++++++++++++
media-plugins/kipi-plugins/metadata.xml | 21 +++
4 files changed, 271 insertions(+)
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch
b/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch
new file mode 100644
index 0000000..361059e
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch
@@ -0,0 +1,76 @@
+diff -u -r
a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp
b/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp
+--- a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp
2014-12-16 09:54:40.000000000 +0200
++++ b/extra/kipi-plugins/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 -u -r a/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp
b/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp
+--- a/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp
2014-12-16 09:54:40.000000000 +0200
++++ b/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp
2014-12-24 20:53:06.757881558 +0200
+@@ -197,10 +197,10 @@
+ JCOPY_OPTION copyoption = JCOPYOPT_ALL;
+ jpeg_transform_info transformoption;
+
+- transformoption.perfect = false;
+- transformoption.force_grayscale = false;
+- transformoption.trim = false;
+- transformoption.crop = false;
++ transformoption.perfect = boolean(false);
++ transformoption.force_grayscale = boolean(false);
++ transformoption.trim = boolean(false);
++ transformoption.crop = boolean(false);
+
+ struct jpeg_decompress_struct srcinfo;
+ struct jpeg_compress_struct dstinfo;
+@@ -277,7 +277,7 @@
+ kp_jpeg_qiodevice_src(&srcinfo, &input_file);
+ jcopy_markers_setup(&srcinfo, copyoption);
+
+- (void) jpeg_read_header(&srcinfo, true);
++ (void) jpeg_read_header(&srcinfo, boolean(true));
+
+ // First rotate - execute even if rotate is JXFORM_NONE to apply new EXIF
settings
+ transformoption.transform = rotate;
+@@ -296,10 +296,10 @@
+ kp_jpeg_qiodevice_dest(&dstinfo, &output_file);
+
+ // Do not write a JFIF header if previously the image did not contain it
+- dstinfo.write_JFIF_header = false;
++ dstinfo.write_JFIF_header = boolean(false);
+
+ // Start compressor (note no image data is actually written here)
+- dstinfo.optimize_coding = true;
++ dstinfo.optimize_coding = boolean(true);
+ jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
+
+ // Copy to the output file any extra markers that we want to preserve
+@@ -349,7 +349,7 @@
+ kp_jpeg_qiodevice_src(&srcinfo, &input_file);
+ jcopy_markers_setup(&srcinfo, copyoption);
+
+- (void) jpeg_read_header(&srcinfo, true);
++ (void) jpeg_read_header(&srcinfo, boolean(true));
+
+ transformoption.transform=flip;
+ jtransform_request_workspace(&srcinfo, &transformoption);
+@@ -366,10 +366,10 @@
+ kp_jpeg_qiodevice_dest(&dstinfo, &output_file);
+
+ // Do not write a JFIF header if previously the image did not contain
it
+- dstinfo.write_JFIF_header = false;
++ dstinfo.write_JFIF_header = boolean(false);
+
+ // Start compressor (note no image data is actually written here)
+- dstinfo.optimize_coding = true;
++ dstinfo.optimize_coding = boolean(true);
+ jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
+
+ // Copy to the output file any extra markers that we want to preserve
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch
b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch
new file mode 100644
index 0000000..100e935
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch
@@ -0,0 +1,24 @@
+diff -ruN digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt
digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt
+--- digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt 2014-12-16
08:54:40.000000000 +0100
++++ digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt 2014-12-21
21:50:39.901188497 +0100
+@@ -370,7 +370,11 @@
+ add_subdirectory(picasawebexport)
+ add_subdirectory(smug)
+ add_subdirectory(printimages)
++
++ if(ENABLE_expoblending)
+ add_subdirectory(expoblending)
++ endif()
++
+ add_subdirectory(kopete)
+ add_subdirectory(batchprocessimages)
+ add_subdirectory(rajceexport)
+@@ -451,7 +455,7 @@
+ add_subdirectory(mediawiki)
+ endif()
+
+- if(FLEX_FOUND AND BISON_FOUND)
++ if(FLEX_FOUND AND BISON_FOUND AND ENABLE_panorama)
+ add_subdirectory(panorama)
+ endif()
+
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
new file mode 100644
index 0000000..f925bb3
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
@@ -0,0 +1,150 @@
+# 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
+
+OPENGL_REQUIRED="optional"
+
+KDE_MINIMAL="4.10"
+
+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
+sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK
zh_TW
+zu"
+
+KDE_HANDBOOK="optional"
+
+inherit flag-o-matic kde4-base
+
+MY_PV=${PV/_/-}
+MY_P="digikam-${MY_PV}"
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="http://www.digikam.org/";
+SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod
mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
+
+COMMONDEPEND="
+ kde-apps/libkipi:4
+ kde-apps/libkdcraw:4=
+ kde-apps/libkexiv2:4=
+ dev-libs/expat
+ dev-libs/kqoauth
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/qjson
+ dev-qt/qtxmlpatterns:4
+ gpssync? ( || ( >=kde-apps/libkgeomap-14.12.0:4
>=media-libs/libkgeomap-4.6.0 ) )
+ media-libs/libpng:0=
+ media-libs/tiff:0
+ virtual/jpeg:0
+ calendar? ( $(add_kdebase_dep kdepimlibs) )
+ crypt? ( app-crypt/qca:2[qt4(+)] )
+ ipod? (
+ media-libs/libgpod
+ x11-libs/gtk+:2
+ )
+ mediawiki? ( >=net-libs/libmediawiki-3.0.0:4 )
+ opengl? (
+ media-libs/phonon[qt4]
+ x11-libs/libXrandr
+ )
+ redeyes? ( >=media-libs/opencv-2.4.9 )
+ scanner? (
+ $(add_kdeapps_dep libksane)
+ media-gfx/sane-backends
+ )
+ upnp? ( media-libs/herqq )
+ videoslideshow? (
+ >=media-libs/qt-gstreamer-0.9.0[qt4(+)]
+ || ( media-gfx/imagemagick
media-gfx/graphicsmagick[imagemagick] )
+ )
+ vkontakte? ( >=net-libs/libkvkontakte-4.12.0:4 )
+"
+DEPEND="${COMMONDEPEND}
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+RDEPEND="${COMMONDEPEND}
+ 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
+ )
+"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
+
+RESTRICT=test
+# bug 420203
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.6.0-options.patch"
+ "${FILESDIR}/${PN}-4.10.0-jpeg.patch"
+)
+
+src_prepare() {
+ # 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
+
+ if ! use redeyes ; then
+ sed -i -e "/DETECT_OPENCV/d" CMakeLists.txt || die
+ fi
+
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ # Remove flags -floop-block -floop-interchange
+ # -floop-strip-mine due to bug #305443.
+ filter-flags -floop-block
+ filter-flags -floop-interchange
+ filter-flags -floop-strip-mine
+
+ mycmakeargs+=(
+ $(cmake-utils_use_with ipod GLIB2)
+ $(cmake-utils_use_with ipod GObject)
+ $(cmake-utils_use_with ipod Gdk)
+ $(cmake-utils_use_with ipod Gpod)
+ $(cmake-utils_use_with calendar KdepimLibs)
+ $(cmake-utils_use_with gpssync KGeoMap)
+ $(cmake-utils_use_with mediawiki Mediawiki)
+ $(cmake-utils_use_find_package redeyes OpenCV)
+ $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use_with crypt QCA2)
+ $(cmake-utils_use_with scanner KSane)
+ $(cmake-utils_use_with upnp Hupnp)
+ $(cmake-utils_use_with vkontakte LibKVkontakte)
+ $(cmake-utils_use_with videoslideshow QtGStreamer)
+ $(cmake-utils_use_enable expoblending)
+ $(cmake-utils_use_enable panorama)
+ )
+
+ kde4-base_src_configure
+}
diff --git a/media-plugins/kipi-plugins/metadata.xml
b/media-plugins/kipi-plugins/metadata.xml
new file mode 100644
index 0000000..74966c6
--- /dev/null
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <herd>kde</herd>
+ <maintainer>
+ <email>dilfri...@gentoo.org</email>
+ </maintainer>
+ <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="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>
+ <flag name="videoslideshow">Build videoslideshow plugin</flag>
+ <flag name="vkontakte">Build plugin for vkontakte.ru</flag>
+ <flag name="linguas_ha">Hausa translation</flag>
+ <flag name="linguas_mi">Maori translation</flag>
+ <flag name="linguas_tt">?? translation</flag>
+ <flag name="linguas_ven">Venda translation</flag>
+ </use>
+</pkgmetadata>
