diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile index e5e8bd3a6da4..fddb204c96f4 100644 --- a/graphics/tesseract/Makefile +++ b/graphics/tesseract/Makefile @@ -1,58 +1,57 @@ # Created by: Andrew Pantyukhin PORTNAME= tesseract -PORTVERSION= 5.1.0 -PORTREVISION= 1 +PORTVERSION= 5.2.0 CATEGORIES= graphics MAINTAINER= pkubaj@FreeBSD.org COMMENT= Commercial quality open source OCR engine LICENSE= APACHE20 BUILD_DEPENDS= asciidoc:textproc/asciidoc \ xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl LIB_DEPENDS= liblept.so:graphics/leptonica \ libtiff.so:graphics/tiff \ libharfbuzz.so:print/harfbuzz \ libfreetype.so:print/freetype2 \ libcurl.so:ftp/curl RUN_DEPENDS= tesseract-data>=0:graphics/tesseract-data USES= autoreconf compiler:c++11-lang cpe gnome libarchive libtool \ localbase pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes CPE_VENDOR= tesseract_project USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}-ocr DATADIR= ${PREFIX}/share/tessdata LDFLAGS+= -pthread PORTDATA= * PORTDOCS= AUTHORS ChangeLog README.md INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS TOOLS OPTIONS_DEFAULT= TOOLS OPTIONS_SUB= yes TOOLS_CONFIGURE_ENABLE= training TOOLS_DESC= Include training tools TOOLS_LIB_DEPENDS=libicui18n.so:devel/icu \ libfontconfig.so:x11-fonts/fontconfig TOOLS_USE= GNOME=cairo,glib20,pango post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-TOOLS-on: @cd ${WRKSRC} && ${MAKE} DESTDIR=${STAGEDIR} training-install .include diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo index 2655cb2d42b2..6750f6bda5a2 100644 --- a/graphics/tesseract/distinfo +++ b/graphics/tesseract/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646157476 -SHA256 (tesseract-ocr-tesseract-5.1.0_GH0.tar.gz) = fdec8528d5a0ecc28ab5fff985e0b8ced60726f6ef33f54126f2868e323d4bd2 -SIZE (tesseract-ocr-tesseract-5.1.0_GH0.tar.gz) = 1910376 +TIMESTAMP = 1657204030 +SHA256 (tesseract-ocr-tesseract-5.2.0_GH0.tar.gz) = eba4deb2f92a3f89a6623812074af8c53b772079525b3c263aa70bbf7b748b3c +SIZE (tesseract-ocr-tesseract-5.2.0_GH0.tar.gz) = 1913462 diff --git a/graphics/tesseract/files/patch-src_arch_simddetect.cpp b/graphics/tesseract/files/patch-src_arch_simddetect.cpp deleted file mode 100644 index 2e645a041b2e..000000000000 --- a/graphics/tesseract/files/patch-src_arch_simddetect.cpp +++ /dev/null @@ -1,41 +0,0 @@ ---- src/arch/simddetect.cpp.orig 2022-04-02 13:06:33 UTC -+++ src/arch/simddetect.cpp -@@ -55,10 +55,12 @@ - #if defined(HAVE_NEON) && !defined(__aarch64__) - # ifdef ANDROID - # include --# else --/* Assume linux */ -+# elif defined(__linux__) - # include - # include -+# elif defined(__FreeBSD__) -+# include -+# include - # endif - #endif - -@@ -85,7 +87,7 @@ SIMDDetect SIMDDetect::detector; - bool SIMDDetect::neon_available_ = true; - #elif defined(HAVE_NEON) - // If true, then Neon has been detected. --bool SIMDDetect::neon_available_; -+bool SIMDDetect::neon_available_ = false; - #else - // If true, then AVX has been detected. - bool SIMDDetect::avx_available_; -@@ -216,9 +218,12 @@ SIMDDetect::SIMDDetect() { - if (family == ANDROID_CPU_FAMILY_ARM) - neon_available_ = (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON); - } --# else -- /* Assume linux */ -+# elif defined(__linux__) - neon_available_ = getauxval(AT_HWCAP) & HWCAP_NEON; -+# elif defined(__FreeBSD__) -+ unsigned long hwcap = 0; -+ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); -+ neon_available_ = hwcap & HWCAP_NEON; - # endif - #endif - diff --git a/graphics/tesseract/pkg-plist b/graphics/tesseract/pkg-plist index d29c9dba9737..b30eda70539f 100644 --- a/graphics/tesseract/pkg-plist +++ b/graphics/tesseract/pkg-plist @@ -1,51 +1,51 @@ %%TOOLS%%bin/ambiguous_words %%TOOLS%%bin/classifier_tester %%TOOLS%%bin/cntraining %%TOOLS%%bin/combine_lang_model %%TOOLS%%bin/combine_tessdata %%TOOLS%%bin/dawg2wordlist %%TOOLS%%bin/lstmeval %%TOOLS%%bin/lstmtraining %%TOOLS%%bin/merge_unicharsets %%TOOLS%%bin/mftraining %%TOOLS%%bin/set_unicharset_properties %%TOOLS%%bin/shapeclustering bin/tesseract %%TOOLS%%bin/text2image %%TOOLS%%bin/unicharset_extractor %%TOOLS%%bin/wordlist2dawg include/tesseract/baseapi.h include/tesseract/capi.h include/tesseract/export.h include/tesseract/ltrresultiterator.h include/tesseract/ocrclass.h include/tesseract/osdetect.h include/tesseract/pageiterator.h include/tesseract/publictypes.h include/tesseract/renderer.h include/tesseract/resultiterator.h include/tesseract/unichar.h include/tesseract/version.h lib/libtesseract.a lib/libtesseract.so lib/libtesseract.so.5 -lib/libtesseract.so.5.0.1 +lib/libtesseract.so.5.0.2 libdata/pkgconfig/tesseract.pc man/man1/ambiguous_words.1.gz man/man1/classifier_tester.1.gz man/man1/cntraining.1.gz man/man1/combine_lang_model.1.gz man/man1/combine_tessdata.1.gz man/man1/dawg2wordlist.1.gz man/man1/lstmeval.1.gz man/man1/lstmtraining.1.gz man/man1/merge_unicharsets.1.gz man/man1/mftraining.1.gz man/man1/set_unicharset_properties.1.gz man/man1/shapeclustering.1.gz man/man1/tesseract.1.gz man/man1/text2image.1.gz man/man1/unicharset_extractor.1.gz man/man1/wordlist2dawg.1.gz man/man5/unicharambigs.5.gz man/man5/unicharset.5.gz