mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
Merge updates from master
This commit is contained in:
@@ -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);
|
||||
@@ -63,6 +63,7 @@ RDEPEND="
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-10.03.0-c99.patch
|
||||
"${FILESDIR}"/${PN}-10.03.1-arm64-neon-tesseract.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
https://bugs.gentoo.org/924757
|
||||
https://bugs.gentoo.org/926891
|
||||
https://github.com/tesseract-ocr/tesseract/pull/4154
|
||||
|
||||
(Note that if moving to CMake, can use the patch from ghostscript-gpl
|
||||
instead, i.e. https://src.fedoraproject.org/rpms/tesseract/blob/rawhide/f/tesseract_neon.patch).
|
||||
|
||||
From b1e48789d61d995740762f66f505385db42410a5 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Palus <jpalus@fastmail.com>
|
||||
Date: Mon, 30 Oct 2023 01:36:57 +0100
|
||||
Subject: [PATCH] Check if NEON extension are actually available
|
||||
|
||||
User may pass own compiler flags to configure which override those
|
||||
provided by project through automake. Therefore it is possible for user
|
||||
on ARM platform to pass CXXFLAGS=-mfpu=vfp which will effectively
|
||||
disable NEON even though used compiler supports -mfpu=neon (since user
|
||||
supplied flags take precedence compiler invocation will use flags:
|
||||
-mfpu=neon -mfpu=vfp). Instead of checking whether compiler supports
|
||||
-mfpu=neon flag, check if NEON extensions are available by checking if
|
||||
__ARM_NEON is defined when compiling with -mfpu=neon and user supplied
|
||||
flags combined.
|
||||
|
||||
Signed-off-by: Jan Palus <jpalus@fastmail.com>
|
||||
---
|
||||
configure.ac | 18 ++++++++++++++----
|
||||
1 file changed, 14 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0b38537229..0514b619c5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -178,10 +178,20 @@ case "${host_cpu}" in
|
||||
;;
|
||||
|
||||
arm*)
|
||||
-
|
||||
- AX_CHECK_COMPILE_FLAG([-mfpu=neon], [neon=true], [neon=false], [$WERROR])
|
||||
- AM_CONDITIONAL([HAVE_NEON], $neon)
|
||||
- if $neon; then
|
||||
+ SAVE_CXXFLAGS="$CXXFLAGS"
|
||||
+ CXXFLAGS="-mfpu=neon $CXXFLAGS"
|
||||
+ AC_MSG_CHECKING([for NEON support])
|
||||
+ AC_COMPILE_IFELSE(
|
||||
+ [AC_LANG_PROGRAM([], [[
|
||||
+ #ifndef __ARM_NEON
|
||||
+ #error
|
||||
+ #endif
|
||||
+ ]])],
|
||||
+ [neon=yes], [neon=no])
|
||||
+ AC_MSG_RESULT([$neon])
|
||||
+ CXXFLAGS="$SAVE_CXXFLAGS"
|
||||
+ AM_CONDITIONAL([HAVE_NEON], test "xyes" = "x$neon")
|
||||
+ if test "xyes" = "$neon"; then
|
||||
AC_DEFINE([HAVE_NEON], [1], [Enable NEON instructions])
|
||||
NEON_CXXFLAGS="-mfpu=neon"
|
||||
AC_SUBST([NEON_CXXFLAGS])
|
||||
|
||||
@@ -37,6 +37,10 @@ DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/libxslt
|
||||
doc? ( app-text/doxygen )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
@@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/libxslt
|
||||
doc? ( app-text/doxygen )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
@@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/libxslt
|
||||
doc? ( app-text/doxygen )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user