From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7CCC138353 for ; Thu, 2 Apr 2020 00:55:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D256E0BD3; Thu, 2 Apr 2020 00:55:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC1DFE0BD3 for ; Thu, 2 Apr 2020 00:55:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B233534F92F for ; Thu, 2 Apr 2020 00:55:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10E3D1B1 for ; Thu, 2 Apr 2020 00:55:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1585788881.94ce677e730dab74c073f9ac560ab3c8111d9c08.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/digikam/digikam-9999.ebuild media-gfx/digikam/metadata.xml X-VCS-Directories: media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 94ce677e730dab74c073f9ac560ab3c8111d9c08 X-VCS-Branch: master Date: Thu, 2 Apr 2020 00:55:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ef937e22-dc42-41c5-a8bc-518dc4055266 X-Archives-Hash: c327d68f6d98536d5fea50f7b33ae7e3 commit: 94ce677e730dab74c073f9ac560ab3c8111d9c08 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 31 18:49:42 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 2 00:54:41 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=94ce677e media-gfx/digikam: Drop USE dnn This is now unconditional upstream, commit 8f88c85672c1afdcc88162afbdb674ba874fb1fc Package-Manager: Portage-2.3.96, Repoman-2.3.22 RepoMan-Options: --force Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-9999.ebuild | 6 ++---- media-gfx/digikam/metadata.xml | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index b304214bc7..b7a206a7f9 100644 --- a/media-gfx/digikam/digikam-9999.ebuild +++ b/media-gfx/digikam/digikam-9999.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="https://www.digikam.org/" LICENSE="GPL-2" SLOT="5" -IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" +IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" BDEPEND=" >=dev-util/cmake-3.14.3 @@ -63,7 +63,7 @@ COMMON_DEPEND=" media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= - >=media-libs/opencv-3.1.0:= + >=media-libs/opencv-3.3.0:=[contrib,contribdnn] media-libs/tiff:0 virtual/jpeg:0 addressbook? ( @@ -71,7 +71,6 @@ COMMON_DEPEND=" >=kde-frameworks/kcontacts-${KFMIN}:5 ) calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) - dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] ) gphoto2? ( media-libs/libgphoto2:= ) heif? ( media-libs/x265:= ) imagemagick? ( media-gfx/imagemagick:= ) @@ -131,7 +130,6 @@ src_configure() { -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) $(cmake_use_find_package calendar KF5CalendarCore) - -DENABLE_FACESENGINE_DNN=$(usex dnn) $(cmake_use_find_package gphoto2 Gphoto2) $(cmake_use_find_package heif X265) $(cmake_use_find_package imagemagick ImageMagick) diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 5843335b38..a9fe85e506 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -10,7 +10,6 @@ Enable akonadi contact integration - Build neural network faces engine module Enable support for ISO/IEC 23008-12:2017 HEIF files using media-libs/x265 Enable support for additional image formats such as XCF, FITS, HEIC etc. Enable support for media-libs/lensfun