From nobody Sun Apr 03 15:24:29 2022 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 7FAA81A5FA9C; Sun, 3 Apr 2022 15:24:30 +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 4KWd4F6Vwlz4TVY; Sun, 3 Apr 2022 15:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648999470; 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=wdydaX1V/PoH+0IHgMQ0ZFGSMocjPEiZzQ9Dtj7vEbw=; b=XFGTSivMd4C/qvTAhm8URo/DXANywY1KYsfLPb8RQN2PExKzCSktIuQ1b0K4HOPlanxc6q 6YNCmKzuCvuI0BweZXSmMObvLxHKcT23sq+lAVD8GXzqrIxZr+tpHHPBayBOYd4gIb0rfF Pp3uBUJ9ReP4D5fYE/LhHpHPXV9WX6xYoqCBQIRXtsQqE7CWKguCi3LSOaFb6Zjhd5Fss8 I5BNbLnKDT2bym5u9yU6BOqGvTrNiWFx8aMduULlFOUy6SmY3FpN+LaUzCE01JnDYjd4dH elokcmyNkv2XMslWcqjAx+OQK5Xb14c/MqmZAPSoqJn9+RZVvkZoNp6n8mf+4g== 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 3BCE61FF1C; Sun, 3 Apr 2022 15:24:29 +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 233FOTl7097103; Sun, 3 Apr 2022 15:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 233FOT8I097102; Sun, 3 Apr 2022 15:24:29 GMT (envelope-from git) Date: Sun, 3 Apr 2022 15:24:29 GMT Message-Id: <202204031524.233FOT8I097102@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: 8fce874533ef - 2022Q2 - graphics/tesseract: Fix build on armv6/armv7 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 8fce874533efe8c9a17678089076c5d1ab41d133 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648999470; 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=wdydaX1V/PoH+0IHgMQ0ZFGSMocjPEiZzQ9Dtj7vEbw=; b=nw6WZUC7dQU8sW3FhU1Z415TLW44k6lTwREgZE6Az5/8gm3VtdMPqzeRfpSfvUSlFCOwQM rpP/vUVBJn4FMG/QZPqm8rurks7Es7v6EqGgkFSalEtGQeCDk0nW8vRnBZMChBbiFsCADm eNwSa0fSLz++c6FY068tFhfB4HhJynjf+/rkPuW5tYltIkZiysxKQJ++7fj6GXWVZ6kunv OCUDPXf85rKcE1/tYbYIShxnJKqIY6wckatnxK21Y/scDrcS9DG5PFCBmGn72UUyu70ll0 zWXC5xuG2w4hQK9bZrhRbxu11YFkELArgfeTa3nYGPTKuX3JwgS29OhZM2grqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648999470; a=rsa-sha256; cv=none; b=cOgXaMQ8vbkK99YcPd0I4hU8EQ1mCt0uJisTkb83GB1JcOfrbnwJke2iZOsUQcKoBcADka HJPNWwKGN296l6Z4ZoRaxoDwmmn3kFGjMpKZocJrO0DJRKFvRrMFPWxbnOQdxrlVbjMx5w xMJsuj3HS0cPrGgRe3rXfftqNhiM6Zx7gOhEYZzdggoDx6l5aUPYht40m7XG+CpSExq2CV sW+6crGAtQaFzJpt186/BH7+c0p8xjJO9kIPUz7smd075DC2bWIwS6SmWwRR8uio6yhfYR Ax9bds42CliyOVwovQ2/5FuOH5BX619C7piM7o1erOiVYBK5a7djlKnj1C0RwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fce874533efe8c9a17678089076c5d1ab41d133 commit 8fce874533efe8c9a17678089076c5d1ab41d133 Author: Robert Clausecker AuthorDate: 2022-04-02 13:54:54 +0000 Commit: Mikael Urankar CommitDate: 2022-04-03 15:24:19 +0000 graphics/tesseract: Fix build on armv6/armv7 Tesseract requires the header to detect the availability of NEON instructions on armv7. This commit adds a patch to use the appropriate FreeBSD interface for this purpose. This issue has already been reported to up stream. See also: https://github.com/tesseract-ocr/tesseract/pull/3782 See also: PR #263003 PR: 263004 Approved by: portmgr (build fix blanket) (cherry picked from commit 31efc7fa161a0da4982f5a3bf687e6bee405395f) --- .../tesseract/files/patch-src_arch_simddetect.cpp | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/graphics/tesseract/files/patch-src_arch_simddetect.cpp b/graphics/tesseract/files/patch-src_arch_simddetect.cpp new file mode 100644 index 000000000000..2e645a041b2e --- /dev/null +++ b/graphics/tesseract/files/patch-src_arch_simddetect.cpp @@ -0,0 +1,41 @@ +--- src/arch/simddetect.cpp.orig 2022-04-02 13:06:33 UTC ++++ src/arch/simddetect.cpp +@@ -55,10 +55,12 @@ + #if defined(HAVE_NEON) && !defined(__aarch64__) + # ifdef ANDROID + # include +-# else +-/* Assume linux */ ++# elif defined(__linux__) + # include + # include ++# elif defined(__FreeBSD__) ++# include ++# include + # endif + #endif + +@@ -85,7 +87,7 @@ SIMDDetect SIMDDetect::detector; + bool SIMDDetect::neon_available_ = true; + #elif defined(HAVE_NEON) + // If true, then Neon has been detected. +-bool SIMDDetect::neon_available_; ++bool SIMDDetect::neon_available_ = false; + #else + // If true, then AVX has been detected. + bool SIMDDetect::avx_available_; +@@ -216,9 +218,12 @@ SIMDDetect::SIMDDetect() { + if (family == ANDROID_CPU_FAMILY_ARM) + neon_available_ = (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON); + } +-# else +- /* Assume linux */ ++# elif defined(__linux__) + neon_available_ = getauxval(AT_HWCAP) & HWCAP_NEON; ++# elif defined(__FreeBSD__) ++ unsigned long hwcap = 0; ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); ++ neon_available_ = hwcap & HWCAP_NEON; + # endif + #endif +