Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tesseract: update to 4.1.1

Browse source 
Switch to AUTORELEASE for simplicity.

Add libarchive dependency since it's now used.

Build with ninja for faster compilation.

Refresh SIMD CMake patch and add musl patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2021-03-14 19:21:58 -07:00
parent 4c8d0f03bb
commit c4981cd87e
3 changed files with 30 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
utils/tesseract/Makefile
View file

@ -7,22 +7,21 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=tesseract PKG_NAME:=tesseract
PKG_VERSION:=4.0.0 PKG_VERSION:=4.1.1
PKG_RELEASE:=2 PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tesseract-ocr/tesseract/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/tesseract-ocr/tesseract/tar.gz/$(PKG_VERSION)?
PKG_HASH:=a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd PKG_HASH:=2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb
PKG_MAINTAINER:=Valentin Kivachuk <vk18496@gmail.com> PKG_MAINTAINER:=Valentin Kivachuk <vk18496@gmail.com>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_PARALLEL:=1
CMAKE_BINARY_SUBDIR:=openwrt-build CMAKE_BINARY_SUBDIR:=openwrt-build
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include ../../devel/ninja/ninja-cmake.mk
define Package/tesseract define Package/tesseract
MENU:=1 MENU:=1
@ -30,7 +29,7 @@ define Package/tesseract
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=Tesseract Open Source OCR Engine TITLE:=Tesseract Open Source OCR Engine
URL:=https://github.com/tesseract-ocr/tesseract URL:=https://github.com/tesseract-ocr/tesseract
DEPENDS:=+libleptonica +libpthread +libstdcpp DEPENDS:=+libleptonica +libarchive +libpthread +libstdcpp
endef endef
TARGET_CFLAGS:=$(filter-out -O%,$(TARGET_CFLAGS)) -O3 TARGET_CFLAGS:=$(filter-out -O%,$(TARGET_CFLAGS)) -O3

56
utils/tesseract/patches/010-cmake.patch
View file

@ -1,44 +1,18 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -224,41 +224,6 @@ set(tesseract_src ${tesseract_src} @@ -252,15 +252,6 @@ set(AVX2_OPT OFF)
src/api/pdfrenderer.cpp set(FMA_OPT OFF)
) set(SSE41_OPT OFF)
set(MARCH_NATIVE_OPT OFF)
-if (WIN32) -foreach(flag ${_enable_vector_unit_list}) # from OptimizeForArchitecture()
- if (MSVC) - string(TOUPPER "${flag}" flag)
- include_directories(src/vs2010/tesseract) - string(REPLACE "\." "_" flag "${flag}")
- set(tesseract_hdr - set(simd_flags "${simd_flags} -D${flag}")
- ${tesseract_hdr} - string(REPLACE "_" "" flag "${flag}")
- ${CMAKE_CURRENT_SOURCE_DIR}/src/vs2010/tesseract/resource.h) - if("${flag}" MATCHES "AVX|AVX2|FMA|SSE41")
- set(tesseract_rsc ${CMAKE_BINARY_DIR}/vs2010/tesseract/libtesseract.rc) - set("${flag}_OPT" ON)
- set_source_files_properties(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductsse.cpp
- PROPERTIES COMPILE_DEFINITIONS __SSE4_1__)
- set_source_files_properties(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixsse.cpp
- PROPERTIES COMPILE_DEFINITIONS __SSE4_1__)
- set_source_files_properties(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductavx.cpp
- PROPERTIES COMPILE_FLAGS "/arch:AVX")
- set_source_files_properties(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixavx2.cpp
- PROPERTIES COMPILE_FLAGS "/arch:AVX2")
- endif() - endif()
-else() -endforeach(flag)
- set_source_files_properties( if (NOT MSVC)
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductsse.cpp set(MARCH_NATIVE_FLAGS "${MARCH_NATIVE_FLAGS} -O3 -ffast-math")
- PROPERTIES COMPILE_FLAGS "-msse4.1") endif()
- set_source_files_properties(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixsse.cpp
- PROPERTIES COMPILE_FLAGS "-msse4.1")
- set_source_files_properties(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductavx.cpp
- PROPERTIES COMPILE_FLAGS "-mavx")
- set_source_files_properties(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixavx2.cpp
- PROPERTIES COMPILE_FLAGS "-mavx2")
-endif()
-
add_library (libtesseract ${LIBRARY_TYPE} ${tesseract_src} ${tesseract_hdr}
${tesseract_rsc}
)

10
utils/tesseract/patches/020-musl.patch Normal file
View file

@ -0,0 +1,10 @@
--- a/src/ccutil/ocrclass.h
+++ b/src/ccutil/ocrclass.h
@@ -28,6 +28,7 @@
#include <chrono>
#include <ctime>
+#include <sys/time.h>
#ifdef _WIN32
#include <winsock2.h> // for timeval
#endif