diff --git a/5.3.4.tar.gz b/5.3.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6667ce77f5983a72947ff03add4c10980e287906 Binary files /dev/null and b/5.3.4.tar.gz differ diff --git a/tesseract.spec b/tesseract.spec index 1bfd2d8260b1bb080ba8b72c152adefa38da8d64..e7f03e77520b4a56abe0f0d03d07d887f2a169a5 100644 --- a/tesseract.spec +++ b/tesseract.spec @@ -1,7 +1,7 @@ %define anolis_release 1 Name: tesseract -Version: 5.3.2 +Version: 5.3.4 Release: %{anolis_release}%{?dist} Summary: Raw OCR Engine @@ -155,6 +155,13 @@ cp -a doc/*.5 %{buildroot}%{_mandir}/man5/ %doc README.md ChangeLog CONTRIBUTING.md AUTHORS %changelog +* Thu Mar 20 2025 mgb01105731 - 5.3.4-1 +- Update to 5.3.4 from 5.3.2 +- Remove patch as the new version of tarball already includes changes +- Add patches to Don't assume neon available on arm64/aarch64 + [Patches cherry-pick from c10s. Original changelog: + - Update to 5.3.4(5.3.4-1)] + * Wed Jul 12 2023 Funda Wang - 5.3.2-1 - New version 5.3.2 diff --git a/tesseract_cmake.patch b/tesseract_cmake.patch index 18c7d59f8e74a6cbf7df74675702a5c9f4dce2f8..44d04da37b66fabbf6b3a37eb996f4fb90403f33 100644 --- a/tesseract_cmake.patch +++ b/tesseract_cmake.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference tesseract-5.3.1/CMakeLists.txt tesseract-5.3.1-new/CMakeLists.txt ---- tesseract-5.3.1/CMakeLists.txt 2023-04-01 21:50:30.000000000 +0200 -+++ tesseract-5.3.1-new/CMakeLists.txt 2023-04-03 12:08:00.033581846 +0200 -@@ -361,7 +361,7 @@ elseif(UNIX) +diff -rupN --no-dereference tesseract-5.3.4/CMakeLists.txt tesseract-5.3.4-new/CMakeLists.txt +--- tesseract-5.3.4/CMakeLists.txt 2024-01-18 08:48:04.000000000 +0100 ++++ tesseract-5.3.4-new/CMakeLists.txt 2024-01-21 09:25:25.006991375 +0100 +@@ -365,7 +365,7 @@ elseif(UNIX) set(LIB_pthread pthread) endif() elseif(WIN32) @@ -10,7 +10,7 @@ diff -rupN --no-dereference tesseract-5.3.1/CMakeLists.txt tesseract-5.3.1-new/C endif() add_definitions("-DCMAKE_BUILD") -@@ -831,12 +831,17 @@ set_target_properties( +@@ -853,12 +853,17 @@ set_target_properties( libtesseract PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) @@ -34,7 +34,7 @@ diff -rupN --no-dereference tesseract-5.3.1/CMakeLists.txt tesseract-5.3.1-new/C if(SW_BUILD) target_link_libraries(libtesseract PUBLIC org.sw.demo.danbloomberg.leptonica -@@ -958,9 +963,9 @@ install( +@@ -980,9 +985,9 @@ install( if(INSTALL_CONFIGS) install(FILES ${TESSERACT_CONFIGS} @@ -46,9 +46,9 @@ diff -rupN --no-dereference tesseract-5.3.1/CMakeLists.txt tesseract-5.3.1-new/C endif() # ############################################################################## -diff -rupN --no-dereference tesseract-5.3.1/src/training/CMakeLists.txt tesseract-5.3.1-new/src/training/CMakeLists.txt ---- tesseract-5.3.1/src/training/CMakeLists.txt 2023-04-01 21:50:30.000000000 +0200 -+++ tesseract-5.3.1-new/src/training/CMakeLists.txt 2023-04-03 12:08:00.034581845 +0200 +diff -rupN --no-dereference tesseract-5.3.4/src/training/CMakeLists.txt tesseract-5.3.4-new/src/training/CMakeLists.txt +--- tesseract-5.3.4/src/training/CMakeLists.txt 2024-01-18 08:48:04.000000000 +0100 ++++ tesseract-5.3.4-new/src/training/CMakeLists.txt 2024-01-21 09:25:25.010991182 +0100 @@ -115,7 +115,7 @@ if(NOT DISABLED_LEGACY_ENGINE) common/trainingsampleset.h) endif() diff --git a/tesseract_neon.patch b/tesseract_neon.patch index a295782124c8ab5087eb4b797b33a37d044476ae..6453efb93b6ef78832d1e37bcb06d5d84cd35c74 100644 --- a/tesseract_neon.patch +++ b/tesseract_neon.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference tesseract-5.3.1/CMakeLists.txt tesseract-5.3.1-new/CMakeLists.txt ---- tesseract-5.3.1/CMakeLists.txt 2023-04-03 12:08:00.080581809 +0200 -+++ tesseract-5.3.1-new/CMakeLists.txt 2023-04-03 12:08:00.084581806 +0200 -@@ -248,7 +248,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "a +diff -rupN --no-dereference tesseract-5.3.4/CMakeLists.txt tesseract-5.3.4-new/CMakeLists.txt +--- tesseract-5.3.4/CMakeLists.txt 2024-01-21 09:25:25.058988861 +0100 ++++ tesseract-5.3.4-new/CMakeLists.txt 2024-01-21 09:25:25.068988378 +0100 +@@ -249,7 +249,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "a set(HAVE_AVX512F FALSE) set(HAVE_FMA FALSE) set(HAVE_SSE4_1 FALSE) @@ -10,9 +10,9 @@ diff -rupN --no-dereference tesseract-5.3.1/CMakeLists.txt tesseract-5.3.1-new/C elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*") -diff -rupN --no-dereference tesseract-5.3.1/src/arch/simddetect.cpp tesseract-5.3.1-new/src/arch/simddetect.cpp ---- tesseract-5.3.1/src/arch/simddetect.cpp 2023-04-01 21:50:30.000000000 +0200 -+++ tesseract-5.3.1-new/src/arch/simddetect.cpp 2023-04-03 12:08:00.084581806 +0200 +diff -rupN --no-dereference tesseract-5.3.4/src/arch/simddetect.cpp tesseract-5.3.4-new/src/arch/simddetect.cpp +--- tesseract-5.3.4/src/arch/simddetect.cpp 2024-01-18 08:48:04.000000000 +0100 ++++ tesseract-5.3.4-new/src/arch/simddetect.cpp 2024-01-21 09:25:25.071988233 +0100 @@ -254,7 +254,7 @@ SIMDDetect::SIMDDetect() { // SSE detected. SetDotProduct(DotProductSSE, &IntSimdMatrix::intSimdMatrixSSE);