diff --git a/recipes/tesseract/all/conandata.yml b/recipes/tesseract/all/conandata.yml index 9e7636466d54b..d8828739ff9f2 100644 --- a/recipes/tesseract/all/conandata.yml +++ b/recipes/tesseract/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "5.5.2": + url: "https://github.com/tesseract-ocr/tesseract/archive/5.5.2.tar.gz" + sha256: "6235ea0dae45ea137f59c09320406f5888383741924d98855bd2ce0d16b54f21" "5.5.1": url: "https://github.com/tesseract-ocr/tesseract/archive/5.5.1.tar.gz" sha256: "a7a3f2a7420cb6a6a94d80c24163e183cf1d2f1bed2df3bbc397c81808a57237" @@ -21,6 +24,13 @@ sources: url: "https://github.com/tesseract-ocr/tesseract/archive/5.0.0.tar.gz" sha256: "72467b7876dc0c39ef7fbcb0f793f73aee1c78d9fabab3ab19cbac1eb42e9fed" patches: + "5.5.2": + - patch_file: "patches/0004-control-optimizations-5.5.2.patch" + patch_description: "fix condition for cpu optimizations" + patch_type: "portability" + - patch_file: "patches/0005-disable-install-pdb-5.5.2.patch" + patch_description: "disable installing PDB files" + patch_type: "portability" "5.5.1": - patch_file: "patches/0004-control-optimizations-5.4.0.patch" patch_description: "fix condition for cpu optimizations" diff --git a/recipes/tesseract/all/patches/0004-control-optimizations-5.5.2.patch b/recipes/tesseract/all/patches/0004-control-optimizations-5.5.2.patch new file mode 100644 index 0000000000000..410f36853a1b6 --- /dev/null +++ b/recipes/tesseract/all/patches/0004-control-optimizations-5.5.2.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6ad09d..8da1683 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,7 +167,7 @@ endif(ENABLE_NATIVE) + + message(STATUS "CMAKE_SYSTEM_PROCESSOR=<${CMAKE_SYSTEM_PROCESSOR}>") + +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86|x86_64|AMD64|amd64|i386|i686") ++if(ENABLE_OPTIMIZATIONS AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86|x86_64|AMD64|amd64|i386|i686") + + set(HAVE_NEON FALSE) + if(MSVC) diff --git a/recipes/tesseract/all/patches/0005-disable-install-pdb-5.5.2.patch b/recipes/tesseract/all/patches/0005-disable-install-pdb-5.5.2.patch new file mode 100644 index 0000000000000..8aa88594ec51d --- /dev/null +++ b/recipes/tesseract/all/patches/0005-disable-install-pdb-5.5.2.patch @@ -0,0 +1,179 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6ad09d..49ca41a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1025,7 +1025,7 @@ install( + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + RENAME tesseract.pc) + install(TARGETS tesseract DESTINATION bin) +-if (MSVC) ++if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + install( +@@ -1035,7 +1035,7 @@ install( + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-if (MSVC AND BUILD_SHARED_LIBS) ++if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + install( +diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt +index 32cd5f7..429b720 100644 +--- a/src/training/CMakeLists.txt ++++ b/src/training/CMakeLists.txt +@@ -128,7 +128,7 @@ install( + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + generate_export_header(common_training EXPORT_MACRO_NAME + TESS_COMMON_TRAINING_API) +-if (MSVC AND BUILD_SHARED_LIBS) ++if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + project_group(common_training "Training Tools") +@@ -146,7 +146,7 @@ if(NOT DISABLED_LEGACY_ENGINE) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + endif() +@@ -164,7 +164,7 @@ if(NOT DISABLED_LEGACY_ENGINE) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + endif() +@@ -181,7 +181,7 @@ install( + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +-if (MSVC) ++if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + +@@ -198,7 +198,7 @@ if(NOT DISABLED_LEGACY_ENGINE) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + endif() +@@ -215,7 +215,7 @@ install( + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +-if (MSVC) ++if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + +@@ -232,7 +232,7 @@ if(NOT DISABLED_LEGACY_ENGINE) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + endif() +@@ -250,7 +250,7 @@ if(NOT DISABLED_LEGACY_ENGINE) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + endif() +@@ -267,7 +267,7 @@ install( + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +-if (MSVC) ++if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + +@@ -300,7 +300,7 @@ if(ICU_FOUND) + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- if (MSVC AND BUILD_SHARED_LIBS) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + generate_export_header(unicharset_training EXPORT_MACRO_NAME +@@ -319,7 +319,7 @@ if(ICU_FOUND) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + +@@ -335,7 +335,7 @@ if(ICU_FOUND) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + +@@ -351,7 +351,7 @@ if(ICU_FOUND) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + +@@ -367,7 +367,7 @@ if(ICU_FOUND) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + +@@ -383,7 +383,7 @@ if(ICU_FOUND) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + +@@ -400,7 +400,7 @@ if(ICU_FOUND) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + +@@ -459,7 +459,7 @@ if(ICU_FOUND) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- if (MSVC) ++ if (0) + install(FILES $ DESTINATION bin OPTIONAL) + endif() + endif() diff --git a/recipes/tesseract/config.yml b/recipes/tesseract/config.yml index 39f97567ea373..4a226a11069c7 100644 --- a/recipes/tesseract/config.yml +++ b/recipes/tesseract/config.yml @@ -1,4 +1,6 @@ versions: + "5.5.2": + folder: all "5.5.1": folder: all "5.5.0":