* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
@ 2015-08-03 19:11 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2015-08-03 19:11 UTC (permalink / raw
To: gentoo-commits
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>dilfridge@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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
@ 2015-08-03 19:24 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2015-08-03 19:24 UTC (permalink / raw
To: gentoo-commits
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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
@ 2015-08-08 8:54 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2015-08-08 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 1b2d5ae6301abab0f97d1c39343db9a77a453713
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 8 08:46:00 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Aug 8 08:46:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b2d5ae6
[media-plugins/kipi-plugins] Moved to the main tree
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 | 145 ---------------------
...gins-5.9999.ebuild => kipi-plugins-9999.ebuild} | 0
media-plugins/kipi-plugins/metadata.xml | 7 -
5 files changed, 252 deletions(-)
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
deleted file mode 100644
index 361059e..0000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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
deleted file mode 100644
index 100e935..0000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 8a045af..0000000
--- a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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_HANDBOOK="optional"
-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"
-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/kipi-plugins-5.9999.ebuild b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
similarity index 100%
rename from media-plugins/kipi-plugins/kipi-plugins-5.9999.ebuild
rename to media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index 61950f1..1b66415 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -7,16 +7,9 @@
</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="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>
- <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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
@ 2015-09-17 8:40 Manuel Rüger
0 siblings, 0 replies; 6+ messages in thread
From: Manuel Rüger @ 2015-09-17 8:40 UTC (permalink / raw
To: gentoo-commits
commit: a12d61732fb9bbda5c59cd8bc0ee84b0ff5c9140
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Sep 15 17:11:16 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 08:38:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a12d6173
media-plugins/kipi-plugins: Fix DEPENDs, expoblending patch
See also: https://bugs.gentoo.org/show_bug.cgi?id=560562
Package-Manager: portage-2.2.20.1
.../files/kipi-plugins-5.0.0-expoblending.patch | 16 +++++++---------
media-plugins/kipi-plugins/kipi-plugins-9999.ebuild | 14 ++------------
2 files changed, 9 insertions(+), 21 deletions(-)
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
index 33fcb33..d548f34 100644
--- 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
@@ -1,16 +1,14 @@
--- 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 @@
++++ b/CMakeLists.txt 2015-09-15 19:07:39.000000000 +0200
+@@ -310,7 +310,10 @@
+ add_subdirectory(kmlexport)
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()
+
+ if(BUILD_VIEWERS)
+ add_subdirectory(advancedslideshow)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
index ce36d7d..c78bc7c 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.digikam.org/"
LICENSE="GPL-2"
KEYWORDS=""
-IUSE="cdr calendar expoblending geolocator +imagemagick mediawiki opengl panorama scanner vkontakte"
+IUSE="cdr calendar expoblending geolocator +imagemagick mediawiki opengl panorama vkontakte"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
LICENSE="${LICENSE} handbook? ( FDL-1.2 )"
@@ -50,7 +50,6 @@ COMMONDEPEND="
$(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)
@@ -92,10 +91,6 @@ COMMONDEPEND="
x11-libs/libXrandr
virtual/opengl
)
- scanner? (
- $(add_kdeapps_dep libksane)
- media-gfx/sane-backends
- )
vkontakte? ( net-libs/libkvkontakte:5 )
"
DEPEND="${COMMONDEPEND}
@@ -134,12 +129,9 @@ src_prepare() {
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
+# undetect_lib redeyes OPENCV #TODO: Add back when ported
if [[ ${KDE_BUILD_TYPE} != live ]]; then
# prepare the handbook
@@ -172,8 +164,6 @@ src_configure() {
# $(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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
@ 2015-09-19 20:01 Manuel Rüger
0 siblings, 0 replies; 6+ messages in thread
From: Manuel Rüger @ 2015-09-19 20:01 UTC (permalink / raw
To: gentoo-commits
commit: b00082619558b9f98dbf506abbcec1c61b6bb2b6
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep 19 17:12:12 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 20:00:56 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0008261
media-plugins/kipi-plugins: Fix DEPENDs, expoblending patch
Package-Manager: portage-2.2.20.1
.../kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch | 9 ++++-----
media-plugins/kipi-plugins/kipi-plugins-9999.ebuild | 5 -----
2 files changed, 4 insertions(+), 10 deletions(-)
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
index d548f34..2293826 100644
--- 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
@@ -1,14 +1,13 @@
--- a/CMakeLists.txt 2015-08-02 14:04:46.650113184 +0200
+++ b/CMakeLists.txt 2015-09-15 19:07:39.000000000 +0200
-@@ -310,7 +310,10 @@
+@@ -310,7 +310,9 @@
add_subdirectory(kmlexport)
add_subdirectory(sendimages)
add_subdirectory(flashexport)
- add_subdirectory(expoblending)
-+
+ if(ENABLE_expoblending)
+ add_subdirectory(expoblending)
+ endif()
-
- if(BUILD_VIEWERS)
- add_subdirectory(advancedslideshow)
+ add_subdirectory(flickr)
+ add_subdirectory(smug)
+ add_subdirectory(imageshack)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
index c78bc7c..cba7fba 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
@@ -80,10 +80,6 @@ COMMONDEPEND="
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
@@ -127,7 +123,6 @@ src_prepare() {
sed -i -e "/DETECT_LIB${_name}/d" CMakeLists.txt || die
}
- undetect_lib geolocator KGEOMAP
undetect_lib mediawiki
undetect_lib vkontakte KVKONTAKTE
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
@ 2015-11-19 12:17 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2015-11-19 12:17 UTC (permalink / raw
To: gentoo-commits
commit: ad07cf956d5578ae732590613dddfd9decb8a778
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Oct 19 21:20:11 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 12:17:25 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ad07cf95
media-plugins/kipi-plugins: Fix DEPENDs, new USE
Package-Manager: portage-2.2.20.1
.../files/kipi-plugins-5.0.0-expoblending.patch | 13 ----
.../files/kipi-plugins-5.0.0-jpeg.patch | 14 ----
.../kipi-plugins/kipi-plugins-9999.ebuild | 88 +++++++++-------------
media-plugins/kipi-plugins/metadata.xml | 3 +
4 files changed, 38 insertions(+), 80 deletions(-)
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
deleted file mode 100644
index 2293826..0000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt 2015-08-02 14:04:46.650113184 +0200
-+++ b/CMakeLists.txt 2015-09-15 19:07:39.000000000 +0200
-@@ -310,7 +310,9 @@
- add_subdirectory(kmlexport)
- add_subdirectory(sendimages)
- add_subdirectory(flashexport)
-- add_subdirectory(expoblending)
-+ if(ENABLE_expoblending)
-+ add_subdirectory(expoblending)
-+ endif()
- add_subdirectory(flickr)
- add_subdirectory(smug)
- add_subdirectory(imageshack)
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
deleted file mode 100644
index 72b3862..0000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-jpeg.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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-9999.ebuild b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
index a4324cb..fb9b9d7 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
@@ -3,48 +3,39 @@
# $Id$
#
-# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
+# TODO: complete packaging of qtsoap and qtkoauth
#
EAPI=5
if [[ ${KDE_BUILD_TYPE} != live ]]; then
-KDE_HANDBOOK=true
+ KDE_HANDBOOK=true
+ SRC_BRANCH=stable
fi
KDE_TEST=true
-inherit flag-o-matic kde5
+inherit kde5
MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_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 +imagemagick mediawiki opengl panorama vkontakte"
+IUSE="calendar expoblending flashexport mediawiki panorama phonon viewers 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"
+ [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
+ SRC_URI="mirror://kde/${SRC_BRANCH}/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] )
-# )
-
-COMMONDEPEND="
- $(add_frameworks_dep karchive)
+COMMON_DEPEND="
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -52,13 +43,10 @@ COMMONDEPEND="
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
$(add_frameworks_dep ktextwidgets)
$(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
@@ -67,33 +55,30 @@ COMMONDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
- kde-apps/libkexiv2:5=
kde-apps/libkipi:5=
- media-libs/libpng:0=
- media-libs/tiff:0
- virtual/jpeg:0
calendar? ( $(add_kdeapps_dep kcalcore) )
+ flashexport? ( $(add_frameworks_dep karchive) )
mediawiki? ( net-libs/libmediawiki:5 )
- opengl? (
+ panorama? ( $(add_frameworks_dep threadweaver) )
+ phonon? ( media-libs/phonon[qt5] )
+ viewers? (
dev-qt/qtopengl:5
- media-libs/phonon[qt5]
+ x11-libs/libX11
x11-libs/libXrandr
virtual/opengl
)
vkontakte? ( net-libs/libkvkontakte:5 )
"
-DEPEND="${COMMONDEPEND}
+DEPEND="${COMMON_DEPEND}
sys-devel/gettext
panorama? (
sys-devel/bison
sys-devel/flex
)
"
-RDEPEND="${COMMONDEPEND}
+RDEPEND="${COMMON_DEPEND}
!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
@@ -102,11 +87,6 @@ RDEPEND="${COMMONDEPEND}
RESTRICT=test
-PATCHES=(
- "${FILESDIR}/${PN}-5.0.0-expoblending.patch"
- "${FILESDIR}/${PN}-5.0.0-jpeg.patch"
-)
-
src_prepare() {
undetect_lib() {
local _use=${1}
@@ -119,39 +99,41 @@ src_prepare() {
undetect_lib mediawiki
undetect_lib vkontakte KVKONTAKTE
-# undetect_lib redeyes OPENCV #TODO: Add back when ported
+ sed -i -e "/add_subdirectory(expoblending)/ s/^/#DONT/" CMakeLists.txt || die
if [[ ${KDE_BUILD_TYPE} != live ]]; then
# prepare the handbook
- mv "${WORKDIR}/${MY_P}/doc/${PN}" \
- "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
+ mv "${WORKDIR}"/${MY_P}/doc/${PN} "${S}"/doc || die
+
if use handbook; then
- echo "add_subdirectory( doc )" >> CMakeLists.txt
+ echo "add_subdirectory( doc )" >> CMakeLists.txt || die
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 [[ ${SRC_BRANCH} != unstable ]]; then
+ # prepare the translations
+ mv "${WORKDIR}/${MY_P}/po" po || die
+ find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die
+ echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
+ echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+ echo "add_subdirectory( po )" >> CMakeLists.txt || die
+ fi
fi
kde5_src_prepare
}
src_configure() {
- local mycmakeargs+=(
- $(cmake-utils_use_enable expoblending)
+ local mycmakeargs=(
$(cmake-utils_use_find_package calendar KF5CalendarCore)
- $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package flashexport KF5Archive)
$(cmake-utils_use_find_package panorama BISON)
$(cmake-utils_use_find_package panorama FLEX)
+ $(cmake-utils_use_find_package panorama KF5ThreadWeaver)
+ $(cmake-utils_use_find_package phonon Phonon4Qt5)
+ $(cmake-utils_use_find_package viewers OpenGL)
+ $(cmake-utils_use_find_package viewers Qt5OpenGL)
+ $(cmake-utils_use_find_package viewers X11)
)
-# TODO: Add back when ported
-# $(cmake-utils_use_find_package redeyes OpenCV)
-# $(cmake-utils_use_with crypt QCA2)
-# $(cmake-utils_use_with videoslideshow QtGStreamer)
kde5_src_configure
}
diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index dc89873..b5cb8ac 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -7,8 +7,11 @@
</maintainer>
<use>
<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
+ <flag name="flashexport">Build the flash export plugin</flag>
<flag name="mediawiki">Build the mediawiki export plugin</flag>
<flag name="panorama">Pull in dependencies needed by panorama plugin</flag>
+ <flag name="phonon">Enable sound support via media-libs/phonon</flag>
+ <flag name="viewers">Build image- and advanced slideshow viewers</flag>
<flag name="vkontakte">Build plugin for vkontakte.ru</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-11-19 12:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-17 8:40 [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/ Manuel Rüger
-- strict thread matches above, loose matches on Subject: below --
2015-11-19 12:17 Michael Palimaka
2015-09-19 20:01 Manuel Rüger
2015-08-08 8:54 Johannes Huber
2015-08-03 19:24 Johannes Huber
2015-08-03 19:11 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox