Received: by mail.netbsd.org (Postfix, from userid 605) id 1F9E584D69; Sun, 24 May 2020 06:09:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9F59684D53 for ; Sun, 24 May 2020 06:09:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Ls6-OATOAnj5 for ; Sun, 24 May 2020 06:09:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 71A2A84CDB for ; Sun, 24 May 2020 06:09:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6C351FB27; Sun, 24 May 2020 06:09:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1590300579243810" MIME-Version: 1.0 Date: Sun, 24 May 2020 06:09:39 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/graphics/digikam To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20200524060939.6C351FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1590300579243810 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Sun May 24 06:09:39 UTC 2020 Modified Files: pkgsrc/graphics/digikam: Makefile PLIST distinfo Added Files: pkgsrc/graphics/digikam/patches: patch-core_libs_facesengine_detection_opencvfacedetector.cpp patch-core_libs_facesengine_recognition_dlib-dnn_dnnface_dnn__base_cv__image.h Log Message: digikam: fix build with latest opencv. add dependency on x265. To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 pkgsrc/graphics/digikam/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/graphics/digikam/PLIST cvs rdiff -u -r1.49 -r1.50 pkgsrc/graphics/digikam/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/digikam/patches/patch-core_libs_facesengine_detection_opencvfacedetector.cpp \ pkgsrc/graphics/digikam/patches/patch-core_libs_facesengine_recognition_dlib-dnn_dnnface_dnn__base_cv__image.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1590300579243810 Content-Disposition: inline Content-Length: 5557 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/digikam/Makefile diff -u pkgsrc/graphics/digikam/Makefile:1.156 pkgsrc/graphics/digikam/Makefile:1.157 --- pkgsrc/graphics/digikam/Makefile:1.156 Thu May 21 20:53:42 2020 +++ pkgsrc/graphics/digikam/Makefile Sun May 24 06:09:39 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.156 2020/05/21 20:53:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.157 2020/05/24 06:09:39 markd Exp $ DISTNAME= digikam-6.4.0 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_KDE:=digikam/6.4.0/} @@ -41,6 +41,7 @@ CHECK_PORTABILITY_SKIP+= *.desktop.cmake .include "../../misc/libkvkontakte/buildlink3.mk" .include "../../misc/marble/buildlink3.mk" .include "../../multimedia/ffmpeg4/buildlink3.mk" +.include "../../multimedia/x265/buildlink3.mk" .include "../../sysutils/kfilemetadata5/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/libxslt/buildlink3.mk" Index: pkgsrc/graphics/digikam/PLIST diff -u pkgsrc/graphics/digikam/PLIST:1.32 pkgsrc/graphics/digikam/PLIST:1.33 --- pkgsrc/graphics/digikam/PLIST:1.32 Sun Feb 2 03:11:08 2020 +++ pkgsrc/graphics/digikam/PLIST Sun May 24 06:09:39 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.32 2020/02/02 03:11:08 markd Exp $ +@comment $NetBSD: PLIST,v 1.33 2020/05/24 06:09:39 markd Exp $ bin/cleanup_digikamdb bin/digikam bin/digitaglinktree @@ -114,6 +114,7 @@ qt5/plugins/digikam/bqm/Bqm_ColorFX_Plug qt5/plugins/digikam/bqm/Bqm_Convert16To8_Plugin.so qt5/plugins/digikam/bqm/Bqm_Convert8To16_Plugin.so qt5/plugins/digikam/bqm/Bqm_ConvertToDNG_Plugin.so +qt5/plugins/digikam/bqm/Bqm_ConvertToHEIF_Plugin.so qt5/plugins/digikam/bqm/Bqm_ConvertToJP2lugin_Plugin.so qt5/plugins/digikam/bqm/Bqm_ConvertToJPEG_Plugin.so qt5/plugins/digikam/bqm/Bqm_ConvertToPGF_Plugin.so Index: pkgsrc/graphics/digikam/distinfo diff -u pkgsrc/graphics/digikam/distinfo:1.49 pkgsrc/graphics/digikam/distinfo:1.50 --- pkgsrc/graphics/digikam/distinfo:1.49 Wed Nov 20 14:35:43 2019 +++ pkgsrc/graphics/digikam/distinfo Sun May 24 06:09:39 2020 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.49 2019/11/20 14:35:43 mef Exp $ +$NetBSD: distinfo,v 1.50 2020/05/24 06:09:39 markd Exp $ SHA1 (digikam-6.4.0-03/digikam-6.4.0.tar.xz) = 6f067b31a2109f82b2e78c89fc84bd03eab30674 RMD160 (digikam-6.4.0-03/digikam-6.4.0.tar.xz) = 818826ba0fd64785cb25297a1f4c11e0747e0eb2 SHA512 (digikam-6.4.0-03/digikam-6.4.0.tar.xz) = b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 Size (digikam-6.4.0-03/digikam-6.4.0.tar.xz) = 340146992 bytes +SHA1 (patch-core_libs_facesengine_detection_opencvfacedetector.cpp) = e5c05583c31c4d0bfc9a2b7548a7131709a50f96 +SHA1 (patch-core_libs_facesengine_recognition_dlib-dnn_dnnface_dnn__base_cv__image.h) = e3164ad2cc91232abc36b66e56806ad4a0715ee6 SHA1 (patch-core_libs_kmemoryinfo_libstatgrab_kmemoryinfo_backend.cpp) = 2dda961ce33d535cef998a490eeb1969419cbc17 Added files: Index: pkgsrc/graphics/digikam/patches/patch-core_libs_facesengine_detection_opencvfacedetector.cpp diff -u /dev/null pkgsrc/graphics/digikam/patches/patch-core_libs_facesengine_detection_opencvfacedetector.cpp:1.1 --- /dev/null Sun May 24 06:09:39 2020 +++ pkgsrc/graphics/digikam/patches/patch-core_libs_facesengine_detection_opencvfacedetector.cpp Sun May 24 06:09:39 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-core_libs_facesengine_detection_opencvfacedetector.cpp,v 1.1 2020/05/24 06:09:39 markd Exp $ + +Build with recent opencv. From ArchLinux. + +--- core/libs/facesengine/detection/opencvfacedetector.cpp.orig 2019-11-03 09:04:00.000000000 +0000 ++++ core/libs/facesengine/detection/opencvfacedetector.cpp +@@ -166,7 +166,7 @@ public: + * of the region of interest of this cascade (still relative to whole image). + * For frontal face cascades, returns the given parameter unchanged. + */ +- cv::Rect faceROI(const CvRect& faceRect) const ++ cv::Rect faceROI(const cv::Rect faceRect) const + { + return cv::Rect(lround(faceRect.x + roi.x() * faceRect.width), + lround(faceRect.y + roi.y() * faceRect.height), Index: pkgsrc/graphics/digikam/patches/patch-core_libs_facesengine_recognition_dlib-dnn_dnnface_dnn__base_cv__image.h diff -u /dev/null pkgsrc/graphics/digikam/patches/patch-core_libs_facesengine_recognition_dlib-dnn_dnnface_dnn__base_cv__image.h:1.1 --- /dev/null Sun May 24 06:09:39 2020 +++ pkgsrc/graphics/digikam/patches/patch-core_libs_facesengine_recognition_dlib-dnn_dnnface_dnn__base_cv__image.h Sun May 24 06:09:39 2020 @@ -0,0 +1,24 @@ +$NetBSD: patch-core_libs_facesengine_recognition_dlib-dnn_dnnface_dnn__base_cv__image.h,v 1.1 2020/05/24 06:09:39 markd Exp $ + +Build with recent opencv. From ArchLinux. + +--- core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h.orig 2019-11-03 09:04:00.000000000 +0000 ++++ core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h +@@ -52,7 +52,7 @@ public: + << "\n\t img.channels(): " << img.channels() + << "\n\t img.pixel_traits::num: " << pixel_traits::num + ); +- IplImage temp = img; ++ IplImage temp = cvIplImage(img); + init(&temp); + } + +@@ -125,7 +125,7 @@ public: + + cv_image& operator=( const cv::Mat img) + { +- IplImage temp = img; ++ IplImage temp = cvIplImage(img); + init(&temp); + return *this; + } --_----------=_1590300579243810--