graphics/digikam: Update to 8.6.0

Group model data options together.

Prepare for Qt 6.9.

https://www.digikam.org/news/2025-03-15-8.6.0_release_announcement/

graphics/digikam/Makefile

 PORTNAME=	digikam
-DISTVERSION=	8.5.0
-PORTREVISION=	2
+DISTVERSION=	8.6.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION} \
-		https://files.kde.org/digikam/%SUBDIR%/:aesthetic,autotags,face,shape,yunet \
-		https://kde-applicationdata.mirrors.omnilance.com/digikam/%SUBDIR%/:aesthetic,autotags,face,shape,yunet \
-		https://mirrors.ocf.berkeley.edu/kde-applicationdata/digikam/%SUBDIR%/:aesthetic,autotags,face,shape,yunet
+		https://files.kde.org/${PORTNAME}/%SUBDIR%/:aesthetic,autotags,face,yunet \
+		https://kde-applicationdata.mirrors.omnilance.com/${PORTNAME}/%SUBDIR%/:aesthetic,autotags,face,yunet \
+		https://mirrors.ocf.berkeley.edu/kde-applicationdata/${PORTNAME}/%SUBDIR%/:aesthetic,autotags,face,yunet
 MASTER_SITE_SUBDIR=	aestheticdetector/:aesthetic \
 			autotags/:autotags \
 			facesengine/dnnface/:face \
-			facesengine/shape-predictor/:shape \
 			facesengine/yunet/:yunet
 # One bit changed in the naming convention ..
 DISTFILES=	digiKam-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}
 DIST_SUBDIR=	KDE/${PORTNAME}
 EXTRACT_ONLY=	digiKam-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}
 
-PATCH_SITES=	https://invent.kde.org/graphics/digikam/-/commit/
-PATCHFILES+=	577913d0ab3db2a89c5717dce41b5f9d0c461950.patch:-p1 # Fix detection of libksane (fixed in 8.6.0)
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE digital photo management application
 WWW=		https://www.digikam.org/
@@ -41,7 +36,7 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libx265.so:multimedia/x265
 RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 
-USES=		bison cmake compiler:c++17-lang desktop-file-utils eigen:3 \
+USES=		bison cmake compiler:c++20-lang desktop-file-utils eigen:3 \
 		gettext-tools gl gnome jpeg kde:6 magick pkgconfig qt:6 \
 		shebangfix tar:xz xorg
 USE_GL=		opengl glu
@@ -70,32 +65,33 @@ PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 WITH_CCACHE_BUILD=	yes
 
-OPTIONS_DEFINE=		AUTOTAGS FACEDETECT KDEPIM MEDIAPLAYER
+OPTIONS_DEFINE=		KDEPIM MEDIAPLAYER
+OPTIONS_GROUP=		DATA
+DATA_DESC=		Binary data required for certain features
+OPTIONS_GROUP_DATA=	AESTHETIC AUTOTAGS FACEDETECT
 OPTIONS_MULTI=		DB
 DB_DESC=		Database options
 OPTIONS_MULTI_DB=	MYSQL MYSQL_INTERNAL SQLITE3
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NAUTOTAGS:NFACEDETECT} \
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE} \
 			${OPTIONS_MULTI_DB:NMYSQL_INTERNAL}
 OPTIONS_SUB=		yes
 
-AUTOTAGS_DESC=		Install data required for autotagging (~436 MiB)
+# Check core/data/dnnmodels/dnnmodels.conf for new and obsolete files
+# for the AESTHETIC, AUTOTAGS and FACEDETECT options with each update.
+AESTHETIC_DESC=		Install aesthetic detection data (~84 MiB)
+AESTHETIC_DISTFILES=	weights_inceptionv3_299.pb:aesthetic
+
+AUTOTAGS_DESC=		Install auto tags assignment data (~711 MiB)
 AUTOTAGS_DISTFILES=	classification_classes_ILSVRC2012.txt:autotags \
 			coco.names:autotags \
-			resnet50.onnx:autotags \
-			yolov5n_batch_16_s320.onnx:autotags \
-			yolov5x_batch_16_s320.onnx:autotags
-
-FACEDETECT_DESC=	Install data required for face detection (~455 MiB)
-FACEDETECT_DISTFILES=	weights_inceptionv3_299.pb:aesthetic \
-			deploy.prototxt:face \
-			face_recognition_sface_2021dec.onnx:face \
-			openface_nn4.small2.v1.t7:face \
-			res10_300x300_ssd_iter_140000_fp16.caffemodel:face \
-			yolov3-face.cfg:face \
-			yolov3-wider_16000.weights:face \
-			shapepredictor.dat:shape \
-			face_detection_yunet_2023mar.onnx:yunet \
-			face_detection_yunet_2023mar_int8.onnx:yunet
+			efficientnetb7.onnx:autotags \
+			resnet152-v2-7.onnx:autotags \
+			yolo11n.onnx:autotags \
+			yolo11x.onnx:autotags
+
+FACEDETECT_DESC=	Install face management data (~37 MiB)
+FACEDETECT_DISTFILES=	face_recognition_sface_2021dec.onnx:face \
+			face_detection_yunet_2023mar.onnx:yunet
 
 KDEPIM_DESC=		KDEPim Addressbook support
 KDEPIM_USE=		KDE=akonadi,akonadicontacts,contacts,grantleetheme,itemmodels

graphics/digikam/distinfo

-TIMESTAMP = 1739418501
-SHA256 (KDE/digikam/digiKam-8.5.0.tar.xz) = 5c4eaafbca59425a0fe8cb41e7d7a08446defbbb967528bb1148aed0e0d0e975
-SIZE (KDE/digikam/digiKam-8.5.0.tar.xz) = 62028432
+TIMESTAMP = 1742089499
+SHA256 (KDE/digikam/digiKam-8.6.0.tar.xz) = 000971e117201976cba413b6d7201720a8893799d6064bcf158d4388e829c233
+SIZE (KDE/digikam/digiKam-8.6.0.tar.xz) = 58958608
+SHA256 (KDE/digikam/weights_inceptionv3_299.pb) = 8923e3daff71c07533b9023ef32c69d8c058d1e0931d76d8b81241a201138538
+SIZE (KDE/digikam/weights_inceptionv3_299.pb) = 88007527
 SHA256 (KDE/digikam/classification_classes_ILSVRC2012.txt) = 4eb3da435cf544e4a6f390f62c84cb9c9bb68cf8b14e97f8a063452382e5efd2
 SIZE (KDE/digikam/classification_classes_ILSVRC2012.txt) = 21675
 SHA256 (KDE/digikam/coco.names) = 634a1132eb33f8091d60f2c346ababe8b905ae08387037aed883953b7329af84
 SIZE (KDE/digikam/coco.names) = 625
-SHA256 (KDE/digikam/resnet50.onnx) = 490e2761519cbf8a4433f880c2aa16b457730085cf9a8aab1e43d82bcadba4f1
-SIZE (KDE/digikam/resnet50.onnx) = 102146365
-SHA256 (KDE/digikam/yolov5n_batch_16_s320.onnx) = 43cf201144e6918354892a2fda7ccb07b3df1abc136ddac3b5c968dffc847009
-SIZE (KDE/digikam/yolov5n_batch_16_s320.onnx) = 7616008
-SHA256 (KDE/digikam/yolov5x_batch_16_s320.onnx) = e56b5024e6d29f8a35dbfbdd67bbdb69593fb67bfb275915081f9a463fcd355b
-SIZE (KDE/digikam/yolov5x_batch_16_s320.onnx) = 347010839
-SHA256 (KDE/digikam/weights_inceptionv3_299.pb) = 8923e3daff71c07533b9023ef32c69d8c058d1e0931d76d8b81241a201138538
-SIZE (KDE/digikam/weights_inceptionv3_299.pb) = 88007527
-SHA256 (KDE/digikam/deploy.prototxt) = f62621cac923d6f37bd669298c428bb7ee72233b5f8c3389bb893e35ebbcf795
-SIZE (KDE/digikam/deploy.prototxt) = 28092
+SHA256 (KDE/digikam/efficientnetb7.onnx) = 5133666ad23c6bd45c8d817739e66a4743f84080ba9e47301c323ed0986a52a1
+SIZE (KDE/digikam/efficientnetb7.onnx) = 265323876
+SHA256 (KDE/digikam/resnet152-v2-7.onnx) = 40fb3f6dd313ba786a2c8077a0ef7d7b4afeda5d037365400d3a7fbc2b1bee64
+SIZE (KDE/digikam/resnet152-v2-7.onnx) = 241503848
+SHA256 (KDE/digikam/yolo11n.onnx) = 82f23e3cdc299fb44317e8a4b2c1d4d67efd0acd5eb3abcb5bf87a307bca5c43
+SIZE (KDE/digikam/yolo11n.onnx) = 10720316
+SHA256 (KDE/digikam/yolo11x.onnx) = dd81d4d06a4c92a6e1066d024219efe5c4c1982566ddf6ce5c280ebd847f117a
+SIZE (KDE/digikam/yolo11x.onnx) = 228016573
 SHA256 (KDE/digikam/face_recognition_sface_2021dec.onnx) = 0ba9fbfa01b5270c96627c4ef784da859931e02f04419c829e83484087c34e79
 SIZE (KDE/digikam/face_recognition_sface_2021dec.onnx) = 38696353
-SHA256 (KDE/digikam/openface_nn4.small2.v1.t7) = 9b72d54aeb24a64a8135dca8e792f7cc675c99a884a6940350a6cedcf7b7ba08
-SIZE (KDE/digikam/openface_nn4.small2.v1.t7) = 31510785
-SHA256 (KDE/digikam/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 510ffd2471bd81e3fcc88a5beb4eae4fb445ccf8333ebc54e7302b83f4158a76
-SIZE (KDE/digikam/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 5351047
-SHA256 (KDE/digikam/yolov3-face.cfg) = f6563bd6923fd6500d2c2d6025f32ebdba916a85e5c9798351d916909f62aaf5
-SIZE (KDE/digikam/yolov3-face.cfg) = 8334
-SHA256 (KDE/digikam/yolov3-wider_16000.weights) = a88f3b3882e3cce1e553a81d42beef6202cb9afc3db88e7944f9ffbcc369e7df
-SIZE (KDE/digikam/yolov3-wider_16000.weights) = 246305388
-SHA256 (KDE/digikam/shapepredictor.dat) = 6f3d2a59dc30c7c9166983224dcf5732b25de734fff1e36ff1f3047ef90ed82b
-SIZE (KDE/digikam/shapepredictor.dat) = 67740572
 SHA256 (KDE/digikam/face_detection_yunet_2023mar.onnx) = 8f2383e4dd3cfbb4553ea8718107fc0423210dc964f9f4280604804ed2552fa4
 SIZE (KDE/digikam/face_detection_yunet_2023mar.onnx) = 232589
-SHA256 (KDE/digikam/face_detection_yunet_2023mar_int8.onnx) = 321aa5a6afabf7ecc46a3d06bfab2b579dc96eb5c3be7edd365fa04502ad9294
-SIZE (KDE/digikam/face_detection_yunet_2023mar_int8.onnx) = 100416
-SHA256 (KDE/digikam/577913d0ab3db2a89c5717dce41b5f9d0c461950.patch) = d2bbe0d9aeb09a6ee491e49bd8567a131e541e722171ff085a225d95d749d3f0
-SIZE (KDE/digikam/577913d0ab3db2a89c5717dce41b5f9d0c461950.patch) = 3623

graphics/digikam/files/patch-core_libs_widgets_text_localizeselector.cpp

+Fix build with Qt 6.9. QChar constructors no longer perform implicit
+conversions.
+
+--- core/libs/widgets/text/localizeselector.cpp.orig	2025-03-15 14:01:45 UTC
++++ core/libs/widgets/text/localizeselector.cpp
+@@ -326,7 +326,7 @@ bool s_inlineTranslateString(const QString& text, cons
+     }
+     else
+     {
+-        error = QChar(trengine->error());
++        error = QChar(static_cast<int>(trengine->error()));
+     }
+ 
+     return false;

graphics/digikam/pkg-plist

@@ -397,19 +397,13 @@ share/applications/org.kde.showfoto.desktop
 %%DATADIR%%/dnnmodels/dnnmodels.conf
 %%AUTOTAGS%%%%DATADIR%%/facesengine/classification_classes_ILSVRC2012.txt
 %%AUTOTAGS%%%%DATADIR%%/facesengine/coco.names
-%%FACEDETECT%%%%DATADIR%%/facesengine/deploy.prototxt
+%%AUTOTAGS%%%%DATADIR%%/facesengine/efficientnetb7.onnx
 %%FACEDETECT%%%%DATADIR%%/facesengine/face_detection_yunet_2023mar.onnx
-%%FACEDETECT%%%%DATADIR%%/facesengine/face_detection_yunet_2023mar_int8.onnx
 %%FACEDETECT%%%%DATADIR%%/facesengine/face_recognition_sface_2021dec.onnx
-%%FACEDETECT%%%%DATADIR%%/facesengine/openface_nn4.small2.v1.t7
-%%FACEDETECT%%%%DATADIR%%/facesengine/res10_300x300_ssd_iter_140000_fp16.caffemodel
-%%AUTOTAGS%%%%DATADIR%%/facesengine/resnet50.onnx
-%%FACEDETECT%%%%DATADIR%%/facesengine/shapepredictor.dat
-%%FACEDETECT%%%%DATADIR%%/facesengine/weights_inceptionv3_299.pb
-%%FACEDETECT%%%%DATADIR%%/facesengine/yolov3-face.cfg
-%%FACEDETECT%%%%DATADIR%%/facesengine/yolov3-wider_16000.weights
-%%AUTOTAGS%%%%DATADIR%%/facesengine/yolov5n_batch_16_s320.onnx
-%%AUTOTAGS%%%%DATADIR%%/facesengine/yolov5x_batch_16_s320.onnx
+%%AUTOTAGS%%%%DATADIR%%/facesengine/resnet152-v2-7.onnx
+%%AESTHETIC%%%%DATADIR%%/facesengine/weights_inceptionv3_299.pb
+%%AUTOTAGS%%%%DATADIR%%/facesengine/yolo11n.onnx
+%%AUTOTAGS%%%%DATADIR%%/facesengine/yolo11x.onnx
 %%DATADIR%%/geoiface/backend-googlemaps-js.js
 %%DATADIR%%/geoiface/backend-googlemaps.html
 %%DATADIR%%/geoiface/cluster-circle-00ff00-selected.png