Received: by mail.netbsd.org (Postfix, from userid 605) id E345F84F1E; Fri, 9 Feb 2024 11:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1707479433; bh=N6jy3yIolTe6GLT3RbUKxEf5l5LpAJ0DtTWjHz4lkMs=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=aaZbwhJe4RVynm93Q2bolDduh04nvjQK8nKlHtHxCHusjWpLJkpUIytiqMqVPO+hO 6yTVgnWr7Y4m1qV0rRnw5aevl/DMU0FGq+upTTpkbWJ5f6xogW+H8iJQhVBCc1SiQV jkGmHsXdx5ZRc2fazi8lfkdEMkxCkx8ld9SFzMYM= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1F6A884D52 for ; Fri, 9 Feb 2024 11:50:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id spI-VruWyv7Y for ; Fri, 9 Feb 2024 11:50:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3BFB284D00 for ; Fri, 9 Feb 2024 11:50:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 34F75FA42; Fri, 9 Feb 2024 11:50:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1707479431220180" MIME-Version: 1.0 Date: Fri, 9 Feb 2024 11:50:31 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/graphics To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20240209115031.34F75FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1707479431220180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri Feb 9 11:50:31 UTC 2024 Modified Files: pkgsrc/graphics/opencv: Makefile distinfo pkgsrc/graphics/opencv-contrib-face: distinfo pkgsrc/graphics/opencv/patches: patch-cmake_OpenCVDetectPython.cmake Log Message: opencv: fix for Numpy 1.26 and Pyton 3.12; fix testing To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 pkgsrc/graphics/opencv/Makefile cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/opencv/distinfo cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/opencv-contrib-face/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1707479431220180 Content-Disposition: inline Content-Length: 5412 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/opencv/Makefile diff -u pkgsrc/graphics/opencv/Makefile:1.126 pkgsrc/graphics/opencv/Makefile:1.127 --- pkgsrc/graphics/opencv/Makefile:1.126 Tue Jan 30 18:29:18 2024 +++ pkgsrc/graphics/opencv/Makefile Fri Feb 9 11:50:30 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.126 2024/01/30 18:29:18 adam Exp $ +# $NetBSD: Makefile,v 1.127 2024/02/09 11:50:30 adam Exp $ PKGREVISION= 2 .include "Makefile.common" @@ -23,7 +23,9 @@ CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopen .include "options.mk" -TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/build/lib +TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib +# For Darwin +TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib TEST_TARGET= test post-install: Index: pkgsrc/graphics/opencv/distinfo diff -u pkgsrc/graphics/opencv/distinfo:1.60 pkgsrc/graphics/opencv/distinfo:1.61 --- pkgsrc/graphics/opencv/distinfo:1.60 Tue Jan 16 19:23:05 2024 +++ pkgsrc/graphics/opencv/distinfo Fri Feb 9 11:50:30 2024 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.60 2024/01/16 19:23:05 adam Exp $ +$NetBSD: distinfo,v 1.61 2024/02/09 11:50:30 adam Exp $ BLAKE2s (opencv-3.4.20.tar.gz) = 2b69e87e4accd4da4d1a599e05fc206cd5644ddeb7f61c9800ddb625648e4ffe SHA512 (opencv-3.4.20.tar.gz) = 45b4447a5312acefffb9b11a6d4e8d8e98c62dcec902e4589d91bb32e7b5bc6e5c6407881a9edcca7d97df598e3f70925e458b2772d991d64ed2cc82701441f8 @@ -8,7 +8,7 @@ SHA1 (patch-3rdparty_protobuf_src_google SHA1 (patch-CMakeLists.txt) = 86a524683091aad65dfaf719d56c5f76056596b6 SHA1 (patch-apps_visualisation_opencv__visualisation.cpp) = b62c32172049c6369fd62a5c72325eef995fd1d0 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529 -SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b +SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 87a304f12f4069103670052dfbedadff2c6e9c05 SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = c7e8db9351f103c7e2a248f047e448e7bf0ac5ad SHA1 (patch-cmake_OpenCVFindProtobuf.cmake) = 2c8cde9efeb3f8a633c5712682ea16adec2e5c38 SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40 Index: pkgsrc/graphics/opencv-contrib-face/distinfo diff -u pkgsrc/graphics/opencv-contrib-face/distinfo:1.30 pkgsrc/graphics/opencv-contrib-face/distinfo:1.31 --- pkgsrc/graphics/opencv-contrib-face/distinfo:1.30 Thu Jan 25 06:51:17 2024 +++ pkgsrc/graphics/opencv-contrib-face/distinfo Fri Feb 9 11:50:31 2024 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2024/01/25 06:51:17 wiz Exp $ +$NetBSD: distinfo,v 1.31 2024/02/09 11:50:31 adam Exp $ BLAKE2s (opencv-3.4.20.tar.gz) = 2b69e87e4accd4da4d1a599e05fc206cd5644ddeb7f61c9800ddb625648e4ffe SHA512 (opencv-3.4.20.tar.gz) = 45b4447a5312acefffb9b11a6d4e8d8e98c62dcec902e4589d91bb32e7b5bc6e5c6407881a9edcca7d97df598e3f70925e458b2772d991d64ed2cc82701441f8 @@ -11,7 +11,7 @@ SHA1 (patch-3rdparty_protobuf_src_google SHA1 (patch-CMakeLists.txt) = 86a524683091aad65dfaf719d56c5f76056596b6 SHA1 (patch-apps_visualisation_opencv__visualisation.cpp) = b62c32172049c6369fd62a5c72325eef995fd1d0 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529 -SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b +SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 87a304f12f4069103670052dfbedadff2c6e9c05 SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = c7e8db9351f103c7e2a248f047e448e7bf0ac5ad SHA1 (patch-cmake_OpenCVFindProtobuf.cmake) = 2c8cde9efeb3f8a633c5712682ea16adec2e5c38 SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40 Index: pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake diff -u pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake:1.1 pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake:1.2 --- pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake:1.1 Mon Dec 16 08:24:39 2019 +++ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake Fri Feb 9 11:50:30 2024 @@ -1,9 +1,21 @@ -$NetBSD: patch-cmake_OpenCVDetectPython.cmake,v 1.1 2019/12/16 08:24:39 adam Exp $ +$NetBSD: patch-cmake_OpenCVDetectPython.cmake,v 1.2 2024/02/09 11:50:30 adam Exp $ + +numpy.distutils is removed in numpy 1.26 on Python 3.12 +https://github.com/opencv/opencv/pull/24351 Do not look for Python 2.x. ---- cmake/OpenCVDetectPython.cmake.orig 2019-12-16 06:04:25.000000000 +0000 +--- cmake/OpenCVDetectPython.cmake.orig 2023-06-27 11:29:13.000000000 +0000 +++ cmake/OpenCVDetectPython.cmake +@@ -216,7 +216,7 @@ if(NOT ${found}) + message(STATUS " PYTHON3_NUMPY_INCLUDE_DIRS") + else() + # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy +- execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))" ++ execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())" + RESULT_VARIABLE _numpy_process + OUTPUT_VARIABLE _numpy_include_dirs + OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -268,13 +268,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION) return() endif() --_----------=_1707479431220180--