[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/

["Johannes Huber" <johu@gentoo.org>]

commit:     13ef4a40615c175ae742a4e1b2fe3ce77cf65032
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 21:40:56 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 21:42:17 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=13ef4a40

media-gfx/digikam: Add mediaplayer use flag

Bug: https://bugs.gentoo.org/show_bug.cgi?id=613146
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 media-gfx/digikam/digikam-9999.ebuild | 6 ++++--
 media-gfx/digikam/metadata.xml        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 389ed74eed..07f15ab39a 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Digital photo management application"
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner X"
+IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	KEYWORDS="~amd64 ~x86"
@@ -74,6 +74,7 @@ COMMON_DEPEND="
 		$(add_qt_dep qtconcurrent)
 		$(add_qt_dep qtnetwork)
 	)
+	mediaplayer? ( media-libs/qtav[opengl] )
 	mysql? ( virtual/mysql[server] )
 	opengl? (
 		$(add_qt_dep qtopengl)
@@ -145,8 +146,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_APPSTYLES=ON
 		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
 		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_MEDIAPLAYER=OFF
 		-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
 		$(cmake-utils_use_find_package calendar KF5CalendarCore)
 		$(cmake-utils_use_find_package gphoto2 Gphoto2)
@@ -154,6 +155,7 @@ src_configure() {
 		$(cmake-utils_use_find_package kipi KF5Kipi)
 		$(cmake-utils_use_find_package lensfun LensFun)
 		$(cmake-utils_use_find_package marble Marble)
+		$(cmake-utils_use_find_package mediaplayer QtAV)
 		$(cmake-utils_use_find_package opengl OpenGL)
 		$(cmake-utils_use_find_package openmp OpenMP)
 		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)

diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index c3a816503f..59e835b018 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -13,8 +13,8 @@
 		<flag name="kipi">Enable support for <pkg>media-plugins/kipi-plugins</pkg></flag>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
 		<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
+		<flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</pkg></flag>
 		<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
 		<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
-<!-- 		<flag name="video">Enable video player support</flag> -->
 	</use>
 </pkgmetadata>