diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-09-15 19:11:16 +0200 |
|---|---|---|
| committer | Manuel Rüger <mrueg@gentoo.org> | 2015-09-17 10:38:00 +0200 |
| commit | a12d61732fb9bbda5c59cd8bc0ee84b0ff5c9140 (patch) | |
| tree | e1f35499fe32d2c110298f0f3d99beddd77fda6e | |
| parent | 002688e3ad55158c839784b490dee69977fbf09d (diff) | |
| download | kde-a12d61732fb9bbda5c59cd8bc0ee84b0ff5c9140.tar.gz kde-a12d61732fb9bbda5c59cd8bc0ee84b0ff5c9140.tar.bz2 kde-a12d61732fb9bbda5c59cd8bc0ee84b0ff5c9140.zip | |
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
| -rw-r--r-- | media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch | 16 | ||||
| -rw-r--r-- | 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 33fcb332ea2..d548f34c206 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 ce36d7d1226..c78bc7c5f54 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 } |