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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     25fda5730b0477ccec49a84c46f8d3686723e3cd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 22:39:33 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 23:03:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25fda573

media-gfx/digikam: Port to KF6, add IUSE video

Patchset content:

Gilles Caulier (2):
      clazy++
      To prevent a race condition at init when sidebar state is restored,
         use a Qtimer singleShot with a lambda

Maik Qualmann (18):
      disable ExifTool tab with a empty URL
      fix use filename instead of path for Exif and Makernote tab
      fix time-consuming index functions in the timeline widget
      show last database error message also in the database settings dialog
      fix missing tags when changing database at runtime
      fix the grid display with 16 bit images in the Lensfun tool
      fix possible sidecar file in the Local Export Tool
      enable the QuickTimeUTC flag in ExifTool
      fix the problem with the QFileSystemWatcher
      same error handling as in query batch mode for a single query
      escape the input from REGEX MATCHALL
      fix BQM workflow context menu
      fix QImage 32 bit (8 bit color) from 16 bit DImg for thumbnails
      fix prepare a copied query and handle bind values correctly
      fix right sidebar view state
      activate the popup in the menu of a KToolBarPopupAction
      fix possible loss of database metadata in the Image Editor
      enable update to unique hash V3

Closes: https://bugs.gentoo.org/936794
Closes: https://bugs.gentoo.org/910337
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/digikam/Manifest                 |   1 +
 media-gfx/digikam/digikam-8.4.0-r10.ebuild | 136 +++++++++++++++++++++++++++++
 media-gfx/digikam/metadata.xml             |   1 +
 3 files changed, 138 insertions(+)

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 279115e68d32..012821e4d073 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
 DIST digiKam-8.3.0-1.tar.xz 55664168 BLAKE2B 46b0f26bb781d370c1046fd6de6afb0a0878175f9722a2fc9ed23aad89eb0671f8b219bb7c169ccd22d440ce493d958304a5a527a733862fe4e2c5cd07da8a21 SHA512 c2fdcecafa68641f08b31286d1b9c44828164a0a0bea607fb64a71c73ff53417cdfefa110245adab164fae8ea0980ea86cd69d693dcd43a96bb188197dc78fcd
 DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b
+DIST digikam-8.4.0-patchset.tar.xz 11904 BLAKE2B 6ab167cae66710505eb81bb538fde2a81458b6580bf8c70d0c28500ca81a3c9c9b9e0a12ca288a4dc6f39ae1a175f7b2bd09e4d94624337348084c228eafcc38 SHA512 df1199d3aaecc0afc032090424af69c031e95afba1fed70b00cf61c5ef52fa2a7c3d97918592c167f9ea918dd2823e4cc52f12a470a9eede815b3ff43314001b

diff --git a/media-gfx/digikam/digikam-8.4.0-r10.ebuild b/media-gfx/digikam/digikam-8.4.0-r10.ebuild
new file mode 100644
index 000000000000..bdae19de0bda
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.4.0-r10.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell video"
+
+# bug 366505
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,-gles2-only,gui,mysql?,network,sql,widgets,xml]
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=media-gfx/exiv2-0.27.1:=[xmp]
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/liblqr
+	media-libs/libpng:=
+	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+	media-libs/tiff:=
+	x11-libs/libX11
+	addressbook? (
+		>=kde-apps/akonadi-contacts-24.05.2:6
+		>=kde-frameworks/kcontacts-${KFMIN}:6
+	)
+	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	heif? (
+		media-libs/libheif:=
+		media-libs/x265:=
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	jpegxl? ( media-libs/libjxl:= )
+	lensfun? ( media-libs/lensfun )
+	opengl? (
+		>=dev-qt/qtbase-${QTMIN}:6[opengl]
+		virtual/opengl
+	)
+	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
+	scanner? ( >=kde-apps/libksane-24.05.2:6 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 )
+	spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 )
+	video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	addressbook? ( >=kde-apps/akonadi-24.05.2:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	media-libs/exiftool
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+	sys-devel/gettext
+	panorama? (
+		app-alternatives/lex
+		app-alternatives/yacc
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.4.0-cmake.patch"
+	"${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch"
+	# bug 936507; KDE-bugs 488662, 490611, 491007, 490484, 490821,
+	# 490859, 490828, 490690, 490552, 490385, 489751, 490128
+	"${WORKDIR}/${P}-patchset"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF6CalendarCore)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif Libheif)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package jpegxl Libjxl)
+		$(cmake_use_find_package lensfun LensFun)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake_use_find_package opengl OpenGL)
+		$(cmake_use_find_package panorama KF6ThreadWeaver)
+		$(cmake_use_find_package scanner KSaneWidgets6)
+		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+		$(cmake_use_find_package spell KF6Sonnet)
+		-DENABLE_MEDIAPLAYER=$(usex video)
+	)
+
+	ecm_src_configure
+}

diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 0a9720425415..9cc51d33573b 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -18,5 +18,6 @@
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</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 integrated video player</flag>
 	</use>
 </pkgmetadata>