From nobody Mon Dec 27 07:18:25 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4C3D61904BD9; Mon, 27 Dec 2021 07:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JMptB07Jtz4WbW; Mon, 27 Dec 2021 07:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D91DE19F83; Mon, 27 Dec 2021 07:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BR7IPS8076827; Mon, 27 Dec 2021 07:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BR7IPQk076826; Mon, 27 Dec 2021 07:18:25 GMT (envelope-from git) Date: Mon, 27 Dec 2021 07:18:25 GMT Message-Id: <202112270718.1BR7IPQk076826@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 0c33cdad9504 - main - graphics/opencv: add local patch List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c33cdad9504ae64ba292420e50a1559c9912589 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640589506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7fPCoJKLQpoHT9ESeN2qtivyqZFSoRMBHkKZtwPMuek=; b=n5XW2wQCZJlNCJ0KT7zLEi4EvrY3+JIC7NcSPdfQrDd06qBT8oDs1OIgp1v+m/DdnCgTGN xFRhmggcIVN5twBfJBG2THQ8sCNnBUfGAIBLT9KQWgbzP2RwO7e7/BkSZJXvWG/iWL77gh curmR4q3ei30tx/Lf6KHgscquxW3EoQLYXbNycL/ZmFc7CBOiqE/XBnNe9CcM/MZsnddvt s7uI/w4kjhzN8AZFsNry6Hr9Y7aeuOvB1kLFyJlYqKwUcL4WnennJDcnfZmo1XGO2nT6as G4riIj2xbDx8iaKy6wTgwnB8cT3PlEMBuWbKr4Kpapx0ZcO4L+E2pDHJvhiTXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640589506; a=rsa-sha256; cv=none; b=ye1JfcU6o2S2mCHvYaXyBWkf42K0guw6GSG4hWEtaRx7mdUiJVAvmLIq8HWY1xqrEE6K70 swsytPP7iPUrqDw01vBHRJfykZY2nr9NAYs699JohHlL60QYovmMYaAzlTRGVXlFvxWiP0 nuYmaRGq9+mwXz1Ka3zq9Etqosi7dbB5BLCwNa3yGMfMCqcco5+VONXILHK4zYFYy/z+6p DppkE9sSeG4Z8Zns0962f4cmYZNgwc+rz3+urZwYacvx3jLo4GM+skqNF6LEy1E2du/zfe e1tODu+2P/zPVVLXZi/7oeApGDHtVu4UhDX/vmF2NWxVvnGgfZ3hKRGDmxhxvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c33cdad9504ae64ba292420e50a1559c9912589 commit 0c33cdad9504ae64ba292420e50a1559c9912589 Author: Tobias C. Berner AuthorDate: 2021-12-27 07:12:38 +0000 Commit: Tobias C. Berner CommitDate: 2021-12-27 07:17:55 +0000 graphics/opencv: add local patch - the patch on github has changed a few times (by dropping two characters). - instead of having it fail to fetch regularly, just add the patch to files/ Reported by: yuri --- graphics/opencv/Makefile | 3 --- graphics/opencv/distinfo | 2 -- graphics/opencv/files/patch-git_998406d | 31 +++++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 84f5c2fb9f66..1c561f3d126f 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -3,9 +3,6 @@ DISTVERSION= 4.5.3 PORTREVISION= 5 CATEGORIES= graphics -PATCH_SITES= https://github.com/opencv/opencv/commit/ -PATCHFILES= 998406d20e93aa36b26fd56506f3ea8a82b43c24.patch:-p1 - MAINTAINER= tcberner@FreeBSD.org COMMENT= Open Source Computer Vision library diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index c8bdfa0e0f18..a93b098b8fb5 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -15,5 +15,3 @@ SHA256 (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar. SIZE (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 63301261 SHA256 (opencv-opencv_3rdparty-a56b6ac6f030c312b2dce17430eef13aed9af274_GH0.tar.gz) = 6d3552455d927dd28cdd6a78470398208ff2167b19b0dd51ab30a241d900cb4c SIZE (opencv-opencv_3rdparty-a56b6ac6f030c312b2dce17430eef13aed9af274_GH0.tar.gz) = 135706483 -SHA256 (998406d20e93aa36b26fd56506f3ea8a82b43c24.patch) = bce0f541613ac800c9f84bffde2f21b035b0528035e89495e7a49c94546334b7 -SIZE (998406d20e93aa36b26fd56506f3ea8a82b43c24.patch) = 1074 diff --git a/graphics/opencv/files/patch-git_998406d b/graphics/opencv/files/patch-git_998406d new file mode 100644 index 000000000000..bc1011b18ce5 --- /dev/null +++ b/graphics/opencv/files/patch-git_998406d @@ -0,0 +1,31 @@ +From f7b4b750d8930b5bb6696cea6d609dc70a0597db Mon Sep 17 00:00:00 2001 +From: mikael +Date: Tue, 21 Sep 2021 19:46:33 +0200 +Subject: [PATCH] Detect FP16 on FreeBSD aarch64 + +--- + modules/core/src/system.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git modules/core/src/system.cpp modules/core/src/system.cpp +index d8b8f6755950..df9e8a0ce76f 100644 +--- modules/core/src/system.cpp ++++ modules/core/src/system.cpp +@@ -533,7 +533,7 @@ struct HWFeatures + } + #endif // CV_CPUID_X86 + +- #if defined __ANDROID__ || defined __linux__ ++ #if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ + #ifdef __aarch64__ + have[CV_CPU_NEON] = true; + have[CV_CPU_FP16] = true; +@@ -559,7 +559,7 @@ struct HWFeatures + CV_LOG_INFO(NULL, "- FP16 instructions is NOT enabled via build flags"); + #endif + #endif +- #elif defined __arm__ ++ #elif defined __arm__ && !defined __FreeBSD__ + int cpufile = open("/proc/self/auxv", O_RDONLY); + + if (cpufile >= 0)