diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index ddc4247a5bd1..ed1ab5a41494 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,15 +1,15 @@ PORTNAME= digikam -DISTVERSION= 8.4.0 -PORTREVISION= 3 +DISTVERSION= 8.5.0 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} \ - https://files.kde.org/digikam/%SUBDIR%/:aesthetic,autotags,face,shape \ - https://kde-applicationdata.mirrors.omnilance.com/digikam/%SUBDIR%/:aesthetic,autotags,face,shape \ - https://mirrors.ocf.berkeley.edu/kde-applicationdata/digikam/%SUBDIR%/:aesthetic,autotags,face,shape + 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 MASTER_SITE_SUBDIR= aestheticdetector/:aesthetic \ autotags/:autotags \ facesengine/dnnface/:face \ - facesengine/shape-predictor/:shape + 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} @@ -81,14 +81,17 @@ AUTOTAGS_DISTFILES= classification_classes_ILSVRC2012.txt:autotags \ yolov5n_batch_16_s320.onnx:autotags \ yolov5x_batch_16_s320.onnx:autotags -FACEDETECT_DESC= Install data required for face detection (~419 MiB) +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 + shapepredictor.dat:shape \ + face_detection_yunet_2023mar.onnx:yunet \ + face_detection_yunet_2023mar_int8.onnx:yunet KDEPIM_DESC= KDEPim Addressbook support KDEPIM_USES= grantlee:5 diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo index 6cf11745265c..f437d141ad45 100644 --- a/graphics/digikam/distinfo +++ b/graphics/digikam/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1720921818 -SHA256 (KDE/digikam/digiKam-8.4.0.tar.xz) = 53c8aca5a2f660173e29a860d8b13844bd0ec748ef3f618c42f7689476494481 -SIZE (KDE/digikam/digiKam-8.4.0.tar.xz) = 58025616 +TIMESTAMP = 1731789297 +SHA256 (KDE/digikam/digiKam-8.5.0.tar.xz) = 5c4eaafbca59425a0fe8cb41e7d7a08446defbbb967528bb1148aed0e0d0e975 +SIZE (KDE/digikam/digiKam-8.5.0.tar.xz) = 62028432 SHA256 (KDE/digikam/classification_classes_ILSVRC2012.txt) = 4eb3da435cf544e4a6f390f62c84cb9c9bb68cf8b14e97f8a063452382e5efd2 SIZE (KDE/digikam/classification_classes_ILSVRC2012.txt) = 21675 SHA256 (KDE/digikam/coco.names) = 634a1132eb33f8091d60f2c346ababe8b905ae08387037aed883953b7329af84 @@ -15,6 +15,8 @@ SHA256 (KDE/digikam/weights_inceptionv3_299.pb) = 8923e3daff71c07533b9023ef32c69 SIZE (KDE/digikam/weights_inceptionv3_299.pb) = 88007527 SHA256 (KDE/digikam/deploy.prototxt) = f62621cac923d6f37bd669298c428bb7ee72233b5f8c3389bb893e35ebbcf795 SIZE (KDE/digikam/deploy.prototxt) = 28092 +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 @@ -25,3 +27,7 @@ SHA256 (KDE/digikam/yolov3-wider_16000.weights) = a88f3b3882e3cce1e553a81d42beef 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 diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist index 382e0c11fce4..1d2a15d2fb73 100644 --- a/graphics/digikam/pkg-plist +++ b/graphics/digikam/pkg-plist @@ -345,9 +345,6 @@ share/applications/org.kde.showfoto.desktop %%DATADIR%%/data/exifinfo.png %%DATADIR%%/data/fabric-texture.png %%DATADIR%%/data/granit-pattern.png -%%DATADIR%%/data/histogram-lin.png -%%DATADIR%%/data/histogram-log.png -%%DATADIR%%/data/histogram.png %%DATADIR%%/data/ice-pattern.png %%DATADIR%%/data/image-full.png %%DATADIR%%/data/image-selection.png @@ -398,9 +395,13 @@ share/applications/org.kde.showfoto.desktop %%DATADIR%%/data/wood-pattern.png %%DATADIR%%/database/dbconfig.xml %%DATADIR%%/database/mysql-global.conf +%%DATADIR%%/dnnmodels/dnnmodels.conf %%AUTOTAGS%%%%DATADIR%%/facesengine/classification_classes_ILSVRC2012.txt %%AUTOTAGS%%%%DATADIR%%/facesengine/coco.names %%FACEDETECT%%%%DATADIR%%/facesengine/deploy.prototxt +%%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 @@ -1881,12 +1882,10 @@ share/applications/org.kde.showfoto.desktop %%DATADIR%%/themes/vanilla/template.xsl %%DATADIR%%/themes/vanilla/vanilla.desktop %%DATADIR%%/utils/digikam-camera -share/icons/hicolor/128x128/apps/avplayer.png share/icons/hicolor/128x128/apps/digikam.png share/icons/hicolor/128x128/apps/expoblending.png share/icons/hicolor/128x128/apps/panorama.png share/icons/hicolor/128x128/apps/showfoto.png -share/icons/hicolor/16x16/apps/avplayer.png share/icons/hicolor/16x16/apps/digikam.png share/icons/hicolor/16x16/apps/dk-box.png share/icons/hicolor/16x16/apps/dk-dropbox.png @@ -1905,7 +1904,6 @@ share/icons/hicolor/16x16/apps/dk-smugmug.png share/icons/hicolor/16x16/apps/expoblending.png share/icons/hicolor/16x16/apps/panorama.png share/icons/hicolor/16x16/apps/showfoto.png -share/icons/hicolor/22x22/apps/avplayer.png share/icons/hicolor/22x22/apps/digikam.png share/icons/hicolor/22x22/apps/dk-box.png share/icons/hicolor/22x22/apps/dk-dropbox.png @@ -1924,7 +1922,6 @@ share/icons/hicolor/22x22/apps/dk-smugmug.png share/icons/hicolor/22x22/apps/expoblending.png share/icons/hicolor/22x22/apps/panorama.png share/icons/hicolor/22x22/apps/showfoto.png -share/icons/hicolor/256x256/apps/avplayer.png share/icons/hicolor/256x256/apps/digikam.png share/icons/hicolor/256x256/apps/showfoto.png share/icons/hicolor/32x32/actions/albumfolder-importdir.png @@ -1945,7 +1942,6 @@ share/icons/hicolor/32x32/actions/tag-recents.png share/icons/hicolor/32x32/actions/tag-reset.png share/icons/hicolor/32x32/actions/tag.png share/icons/hicolor/32x32/actions/underexposure.png -share/icons/hicolor/32x32/apps/avplayer.png share/icons/hicolor/32x32/apps/digikam.png share/icons/hicolor/32x32/apps/dk-box.png share/icons/hicolor/32x32/apps/dk-dropbox.png @@ -1964,7 +1960,6 @@ share/icons/hicolor/32x32/apps/dk-smugmug.png share/icons/hicolor/32x32/apps/expoblending.png share/icons/hicolor/32x32/apps/panorama.png share/icons/hicolor/32x32/apps/showfoto.png -share/icons/hicolor/48x48/apps/avplayer.png share/icons/hicolor/48x48/apps/digikam.png share/icons/hicolor/48x48/apps/dk-box.png share/icons/hicolor/48x48/apps/dk-dropbox.png @@ -1983,12 +1978,10 @@ share/icons/hicolor/48x48/apps/dk-smugmug.png share/icons/hicolor/48x48/apps/expoblending.png share/icons/hicolor/48x48/apps/panorama.png share/icons/hicolor/48x48/apps/showfoto.png -share/icons/hicolor/64x64/apps/avplayer.png share/icons/hicolor/64x64/apps/digikam.png share/icons/hicolor/64x64/apps/showfoto.png share/icons/hicolor/96x96/apps/expoblending.png share/icons/hicolor/96x96/apps/panorama.png -share/icons/hicolor/scalable/apps/avplayer.svgz share/icons/hicolor/scalable/apps/digikam.svgz share/icons/hicolor/scalable/apps/dk-flickr.svgz share/icons/hicolor/scalable/apps/dk-googlephoto.svgz