From nobody Sun Apr 03 15:24:27 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 561CD1A5F8F9; Sun, 3 Apr 2022 15:24:28 +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 4KWd4D1g4qz4TjP; Sun, 3 Apr 2022 15:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648999468; 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=J5v9aPR9zf3xuWroHryinEz8JzM9qw/qMLOOuqDR8es=; b=R8QojUCXAs5ambjglU0qphuGmNyXpveF1ukrGXdX/7LPj9dgwuHfwIeU5TT+0cR5r+lTTC 0jIP4j+HFAy1/N6BKJXIbggqNa/FSmIAgbQPqCFl6iAIbjVNnydNP7byIh4kuN7bLaiJKm 89pyQSVcqYJaKDeNzW35/8StfM2FL5N/ikpJzJoF4XKVDO/WG/EThIKUb+HhbghT0PtrGN NP1kiL9yU7ZwIl0pRKiarlzAVxc6xJCzc7MuVBLlHXTmk/F0tecs54N5BnwjFEOob+/u1w WWX26OAUH3ugouNtRVxeNIR8X/QOaT8NHtpVLwt5U8KUidFzFhF5+A0ekzekRQ== 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 135BA1FDAD; Sun, 3 Apr 2022 15:24:28 +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 233FORCI097072; Sun, 3 Apr 2022 15:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 233FOR84097071; Sun, 3 Apr 2022 15:24:27 GMT (envelope-from git) Date: Sun, 3 Apr 2022 15:24:27 GMT Message-Id: <202204031524.233FOR84097071@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: 3ab0c8c9a420 - 2022Q2 - print/ghostscript9-agpl-base: Fix build on 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: 3ab0c8c9a420bc144618ec4e3d97c611f36cacd9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648999468; 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=J5v9aPR9zf3xuWroHryinEz8JzM9qw/qMLOOuqDR8es=; b=vz2xJuVZfrJxntI9PtrqImF0eHc13UgPkHdVSGURFsG7GY8GfjbWCXvKJlx/aVyw0mW8fz C4yA6cmisvjyEwLOQunBDWvL/Fa9bO9X9/R8TStTRZ+DPiQYSAaYdoKtv5SNxigr/9dOEt Z9Y8exikDJYybv/6FhiKy6fVBEPfIEk7WHdCygejhdmk5nrfGH8R/3d6oAvi6vJGYTinIo CCvG0W6Vqdi/m+/19kr2LFr7xP9JBmuuHkICdAVWRisEFiTpmpEJ1GpQza3Dg5kPxG8bai beMcbzDZ7j0x5/ViOYfQ1R/u/CRi2QhF4GUoKi7zEdXU9bG40X6bq2KRqjOTMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648999468; a=rsa-sha256; cv=none; b=e/P1/64csLUKQaNkqD8ikGQQmQBLiSRI+M4CU/zz/Z1lMuVK+ULQJPRGSBZMVPK17878ZP TUalNuwlql9PVVOAaKuI1LXxitVsid7q0piXkWEeH4TKcs8Y3A1+KIU5xVG+TXI3Ps5jpb VZA1V2CmINR7Cm4p87rlsJh1ABXcNIlhgs0Uy3RZVb2ENK7WonmoajZefVIT4tG4/2sXYn L8NV5t0WqkCY7SJ9QwkQVq1l14gEqOXRJ4cd4chBWK2DY9PdlAx3a9Alfw0Pu4K1jj/nzh fiq3xB1Hp4us1oePU0rODZKimIsCyo6h4LGIrSlRkxr/1fQmfurqHEt7h7BHGw== 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=3ab0c8c9a420bc144618ec4e3d97c611f36cacd9 commit 3ab0c8c9a420bc144618ec4e3d97c611f36cacd9 Author: Robert Clausecker AuthorDate: 2022-04-02 12:51:22 +0000 Commit: Mikael Urankar CommitDate: 2022-04-03 15:24:13 +0000 print/ghostscript9-agpl-base: Fix build on armv7 The bundled version of tesseract requires the header to detect the availability of NEON instructions on armv7. This issue has already been reported to up stream. Reported upstream: https://github.com/tesseract-ocr/tesseract/pull/3782 PR: 263003 Approved by: portmgr (build fix blanket) (cherry picked from commit 16f0acba590a9b850c9a23759ed37427507910bd) --- .../files/patch-tesseract_src_arch_simddetect.cpp | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/print/ghostscript9-agpl-base/files/patch-tesseract_src_arch_simddetect.cpp b/print/ghostscript9-agpl-base/files/patch-tesseract_src_arch_simddetect.cpp new file mode 100644 index 000000000000..85afcf5d10f9 --- /dev/null +++ b/print/ghostscript9-agpl-base/files/patch-tesseract_src_arch_simddetect.cpp @@ -0,0 +1,34 @@ +--- tesseract/src/arch/simddetect.cpp.orig 2021-09-27 07:44:02 UTC ++++ tesseract/src/arch/simddetect.cpp +@@ -40,10 +40,13 @@ + #if defined(HAVE_NEON) && !defined(__aarch64__) + #ifdef ANDROID + #include +-#else ++#elif defined(__linux__) + /* Assume linux */ + #include + #include ++#elif defined(__FreeBSD__) ++#include ++#include + #endif + #endif + +@@ -188,9 +191,15 @@ SIMDDetect::SIMDDetect() { + neon_available_ = (android_getCpuFeatures() & + ANDROID_CPU_ARM_FEATURE_NEON); + } +-#else ++#elif defined(__linux__) + /* Assume 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; ++#else ++ neon_available_ = 0; + #endif + #endif +