From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D856F158083 for ; Sun, 1 Sep 2024 07:34:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18BCDE2A21; Sun, 1 Sep 2024 07:34:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAD08E2A21 for ; Sun, 1 Sep 2024 07:34:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D85293430BA for ; Sun, 1 Sep 2024 07:34:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49AC8DA2 for ; Sun, 1 Sep 2024 07:33:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1725175798.a122be2eff3e44ef7c039d052ac47da8361fd6ae.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/, app-text/ghostscript-gpl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild X-VCS-Directories: app-text/ghostscript-gpl/ app-text/ghostscript-gpl/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a122be2eff3e44ef7c039d052ac47da8361fd6ae X-VCS-Branch: master Date: Sun, 1 Sep 2024 07:33:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dff57416-9cef-42a4-972f-cba7d78a73b9 X-Archives-Hash: 9e1d97768d49227757e1585f7a0e39b4 commit: a122be2eff3e44ef7c039d052ac47da8361fd6ae Author: Sam James gentoo org> AuthorDate: Sun Sep 1 07:29:46 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 1 07:29:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a122be2e app-text/ghostscript-gpl: fix arm* build w/o neon Bug: https://bugs.gentoo.org/924757 Closes: https://bugs.gentoo.org/926891 Signed-off-by: Sam James gentoo.org> ...stscript-gpl-10.03.1-arm64-neon-tesseract.patch | 35 ++++++++++++++++++++++ .../ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild | 1 + 2 files changed, 36 insertions(+) diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch new file mode 100644 index 000000000000..4b64fff16f5e --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/926891 +https://bugs.gentoo.org/924757 +https://src.fedoraproject.org/rpms/tesseract/raw/rawhide/f/tesseract_neon.patch +(See https://github.com/tesseract-ocr/tesseract/pull/4154 too) +--- a/tesseract/CMakeLists.txt ++++ b/tesseract/CMakeLists.txt +@@ -249,7 +249,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64.*|AARCH64.*") + set(HAVE_AVX512F FALSE) + set(HAVE_FMA FALSE) + set(HAVE_SSE4_1 FALSE) +- set(HAVE_NEON TRUE) ++ check_cxx_compiler_flag("-mfpu=neon" HAVE_NEON) + + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*") + +--- a/tesseract/src/arch/simddetect.cpp ++++ b/tesseract/src/arch/simddetect.cpp +@@ -254,7 +254,7 @@ SIMDDetect::SIMDDetect() { + // SSE detected. + SetDotProduct(DotProductSSE, &IntSimdMatrix::intSimdMatrixSSE); + #endif +-#if defined(HAVE_NEON) || defined(__aarch64__) ++#if defined(HAVE_NEON) + } else if (neon_available_) { + // NEON detected. + SetDotProduct(DotProductNEON, &IntSimdMatrix::intSimdMatrixNEON); +@@ -311,7 +311,7 @@ void SIMDDetect::Update() { + } else if (dotproduct == "accelerate") { + SetDotProduct(DotProductAccelerate, IntSimdMatrix::intSimdMatrix); + #endif +-#if defined(HAVE_NEON) || defined(__aarch64__) ++#if defined(HAVE_NEON) + } else if (dotproduct == "neon" && neon_available_) { + // NEON selected by config variable. + SetDotProduct(DotProductNEON, &IntSimdMatrix::intSimdMatrixNEON); diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild index 54f3cdcf36f3..663558774565 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild @@ -63,6 +63,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-10.03.0-c99.patch + "${FILESDIR}"/${PN}-10.03.1-arm64-neon-tesseract.patch ) src_prepare() {