| 1 |
commit: 94ce677e730dab74c073f9ac560ab3c8111d9c08 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 31 18:49:42 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 2 00:54:41 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=94ce677e |
| 7 |
|
| 8 |
media-gfx/digikam: Drop USE dnn |
| 9 |
|
| 10 |
This is now unconditional upstream, commit 8f88c85672c1afdcc88162afbdb674ba874fb1fc |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
| 13 |
RepoMan-Options: --force |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
media-gfx/digikam/digikam-9999.ebuild | 6 ++---- |
| 17 |
media-gfx/digikam/metadata.xml | 1 - |
| 18 |
2 files changed, 2 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild |
| 21 |
index b304214bc7..b7a206a7f9 100644 |
| 22 |
--- a/media-gfx/digikam/digikam-9999.ebuild |
| 23 |
+++ b/media-gfx/digikam/digikam-9999.ebuild |
| 24 |
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.digikam.org/" |
| 25 |
|
| 26 |
LICENSE="GPL-2" |
| 27 |
SLOT="5" |
| 28 |
-IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" |
| 29 |
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" |
| 30 |
|
| 31 |
BDEPEND=" |
| 32 |
>=dev-util/cmake-3.14.3 |
| 33 |
@@ -63,7 +63,7 @@ COMMON_DEPEND=" |
| 34 |
media-libs/lcms:2 |
| 35 |
media-libs/liblqr |
| 36 |
media-libs/libpng:0= |
| 37 |
- >=media-libs/opencv-3.1.0:= |
| 38 |
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn] |
| 39 |
media-libs/tiff:0 |
| 40 |
virtual/jpeg:0 |
| 41 |
addressbook? ( |
| 42 |
@@ -71,7 +71,6 @@ COMMON_DEPEND=" |
| 43 |
>=kde-frameworks/kcontacts-${KFMIN}:5 |
| 44 |
) |
| 45 |
calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) |
| 46 |
- dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] ) |
| 47 |
gphoto2? ( media-libs/libgphoto2:= ) |
| 48 |
heif? ( media-libs/x265:= ) |
| 49 |
imagemagick? ( media-gfx/imagemagick:= ) |
| 50 |
@@ -131,7 +130,6 @@ src_configure() { |
| 51 |
-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON |
| 52 |
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) |
| 53 |
$(cmake_use_find_package calendar KF5CalendarCore) |
| 54 |
- -DENABLE_FACESENGINE_DNN=$(usex dnn) |
| 55 |
$(cmake_use_find_package gphoto2 Gphoto2) |
| 56 |
$(cmake_use_find_package heif X265) |
| 57 |
$(cmake_use_find_package imagemagick ImageMagick) |
| 58 |
|
| 59 |
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml |
| 60 |
index 5843335b38..a9fe85e506 100644 |
| 61 |
--- a/media-gfx/digikam/metadata.xml |
| 62 |
+++ b/media-gfx/digikam/metadata.xml |
| 63 |
@@ -10,7 +10,6 @@ |
| 64 |
</maintainer> |
| 65 |
<use> |
| 66 |
<flag name="addressbook">Enable akonadi contact integration</flag> |
| 67 |
- <flag name="dnn">Build neural network faces engine module</flag> |
| 68 |
<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files using <pkg>media-libs/x265</pkg></flag> |
| 69 |
<flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag> |
| 70 |
<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag> |
Archives