gentoo auto-resync : 01:09:2024 - 12:01:15

5 files changed, 73 insertions, 3 deletions

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 0997ba8da714..ef85d5915fb8 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,9 +1,10 @@
 AUX tesseract-5.3.0-gcc-13.patch 748 BLAKE2B de4ce0e2a312497621f1e037aa0e61b1b0b41b23aaca52ba23f331ee415b6f150ca1487806be5373ed68c46265c74137f5b6e5db9eab8940927d5b05eec89c4b SHA512 4bd7db8ade5f40e92f48f0e4771d9f55c738cb74becaa22c823cb03123ef6d56662e59829015aa5c326e790c5d45d9f6ad7d8be253f9d9f08eebb228a54ee6b9
+AUX tesseract-5.4.1-arm64-neon-tesseract.patch 2065 BLAKE2B 1d91cd4d73bd34657f3b2e09372857b4b5f315b72468538e6be61a6526e4ee6f18e50d3f29f54cb86a6dee1625fa8629151fb5aa6deee4f8a250d71d4715baea SHA512 275a6475291d8a218f99258948960115b6a3b83209897d08e914549cf249896ba4c816d6a5c9f97a91e78421066438fa7a0d4276d8b20bd7ef250640a4cb5243
 DIST tesseract-5.3.0.tar.gz 1913678 BLAKE2B 975b3a50dc2c9ec7ded82caaa068d2d9d362ee0bc6d51b41a52c692ac7f51231d4c64a9dda9e7b850297d4c1f13eb40a709e59eebe143df4f5e2a060cfbbfd3a SHA512 fc0cfda980059390b7d6d3d8e475b4ecc9dcfee1abc3b16fc9ffc8904db0a0847a5f6f1b32bd2e1f6f5a714a8c4df0fb3dc7c6aa25ece6162bf52fe86b4d0f34
 DIST tesseract-5.3.4.tar.gz 1918319 BLAKE2B f4becd425594be132df2c206847faa91daf9bc58d83eac31096f92cf7d7b6c9234ae224ee94ed1f3099414bde393bb86f94d1f76fdc05b4310b415b0d7eb05af SHA512 a81c98c3754a71093df7b51390ccd43d05f661352b4cb564e403b96d81909664c2ecbf2eb6f37614c4639e6dadbf2329b926d09271dbbdaa302f2d7b6b0d628a
 DIST tesseract-5.4.1.tar.gz 1899949 BLAKE2B 8e9ff54902d467a4ef0dc61665570a6d34ecdd2d89fd0023775212eb531e3c11659d17e5bb1733f570f785af4714d5a5259d1f809f6e28c0a65375ba02d21bdc SHA512 a97a31d1b735930a3e8b17bc2eae24210d8242d31399822f8bc2e9f18903d513cf6d02b2274e2f3ce431183467570b3327e01cbc49dca80e38acb90327cc235e
 EBUILD tesseract-5.3.0.ebuild 2139 BLAKE2B 5b9be5f2561db2e2da0ad18eb2bfaf160000bd6aff60f6e38640c841681966f389baa61078a7295c860cc01e19ff55ebb0afbbc58f09b2be830c3666899d27b2 SHA512 255492086b001b95a92741e5f3a049e94d1f04deb3542d3cf9e075d2ac7181ff0bae79ad9207f2b10457122ef3c34a5aa32c6535844db585baeca7823c28e674
-EBUILD tesseract-5.3.4.ebuild 2094 BLAKE2B 9362c5b5b5e10282f5c06197e93e544688919fc1f5821327314ee1aa738f579ca27d0f0f68671d2c26b3d8803f3ec19cb586e6d449a12b56844c79997c42e70a SHA512 76d3d13460c5191f56289a5432e0af00beb45452a36ae8531a71ba1c360cb5602bada2da77f1f4226a548b6fd84318ecfc9ec37a6859146d066e41e09614deed
-EBUILD tesseract-5.4.1.ebuild 1947 BLAKE2B 9dc1f43a91a825497d321e6e6e9e688b796545a8397b6409ea6ff111f75e5359515790c3ee0ea6b7db187edd7b70e5504b51a18630ec5be648e11c0ab7b9a268 SHA512 fdefd88563793b9279c741d89abe8a69a35e7067e3c3019785740294540d1089890c03c8f09f08b35302a08a607f7e7dc9e9b2c8a78684e25a3bfede68799f57
-EBUILD tesseract-9999.ebuild 1864 BLAKE2B 5aaf23d01dc425180b0d07210d10e50526ac0037fc579feb42424c521830b64caa7ac00a8aa4a258b09c965037f9c368279d8d7c0376289c276d50237dd72d4f SHA512 0fce3ad6adf33ba6a87ffb8899a309bbbed66cc74eb4ba4f57b0c6bf8533a84dc7836eefd394f5b20cab2d6d2f3fd6aba2f778e79170bbb0bd5f53232ed4dda6
+EBUILD tesseract-5.3.4.ebuild 2161 BLAKE2B b1f0a178aebb45200a31eafd3f53ea9124caa39724dbcbbf612b0f78961a213290ce51a9e5ca1fa514fc38823a3a643736a0da082f3d91c23f07aea8e89b2e9c SHA512 61c5224c482c7b25ebaa99af2046868c03a6b9fe207e73ed07186be4de07396b72dff2c51bb03bcac8b4e683b9e108d7471d9c0d64733eb776669bfb478707fc
+EBUILD tesseract-5.4.1.ebuild 2014 BLAKE2B ee1331a6256ee890407a9e3486a71810005b4dd1b4fe019e81ad383f770f89b1948854878fd1c1074f60430e154edfcd27362874efbeb2349e25f8010ad1f961 SHA512 698b48ced9deceda68390a1d3a96dc4f4d06e373afb117488902629439382401204a1a32028199a1842122f45b1000d31f3c13ed77bb6f856a46f1f5c17e643c
+EBUILD tesseract-9999.ebuild 1931 BLAKE2B 72d131d97c12fada255afe3d09cecc450baba90f341c6501d21cb9fba902ba82f0ec31eeeb09921fb0f0f92014cc9d7d1255e9d79f06151bf1ac08bb869e4e8f SHA512 996557d564fd9634785e8f0c2d38acbd3b355cec06f99bf27a4975b2a163aca7616a2f1280b474af0ea7f2e23b74318b125791b0fde958971bd9b19d9b201b0e
 MISC metadata.xml 1020 BLAKE2B 77f6c8f3962e00b65495fff0176e7765a9583de651db12b0e532ad5ff4b8005ede93d42d58093ae3b397c40d085963f47ef0e41cfed609b581c1a2f8231ccc72 SHA512 d9ea277a6ad9ec5178252863d60bac1244e372ab6c4f4ce3fe4f7220492e78dec2349742699031ed727251f87173e821c64dec44fb9787c08aad216cad64fa05
diff --git a/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch b/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch
new file mode 100644
index 000000000000..d3869cfea1dd
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch
@@ -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])
+
diff --git a/app-text/tesseract/tesseract-5.3.4.ebuild b/app-text/tesseract/tesseract-5.3.4.ebuild
index d90adb970643..af83b0284a3a 100644
--- a/app-text/tesseract/tesseract-5.3.4.ebuild
+++ b/app-text/tesseract/tesseract-5.3.4.ebuild
@@ -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
 }
diff --git a/app-text/tesseract/tesseract-5.4.1.ebuild b/app-text/tesseract/tesseract-5.4.1.ebuild
index 1469566c29ed..d4438214a13d 100644
--- a/app-text/tesseract/tesseract-5.4.1.ebuild
+++ b/app-text/tesseract/tesseract-5.4.1.ebuild
@@ -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
 }
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index 4c31653fca31..d3c34531c724 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -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
 }