graphics/tesseract: update to 4.1.0, change maintainer address, remove double USES=compiler

Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D20887
This commit is contained in:
Piotr Kubaj 2019-07-12 23:19:53 +00:00
parent 6213345138
commit 0cc3d6ec2e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=506495
6 changed files with 20 additions and 29 deletions

View file

@ -2,11 +2,10 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= tesseract PORTNAME= tesseract
PORTVERSION= 4.0.0 PORTVERSION= 4.1.0
PORTREVISION= 3
CATEGORIES= graphics CATEGORIES= graphics
MAINTAINER= pkubaj@anongoth.pl MAINTAINER= pkubaj@FreeBSD.org
COMMENT= Commercial quality open source OCR engine COMMENT= Commercial quality open source OCR engine
LICENSE= APACHE20 LICENSE= APACHE20
@ -49,7 +48,6 @@ OPENMP_LIB_DEPENDS=libomp.so:devel/openmp
TOOLS_DESC= Include training tools TOOLS_DESC= Include training tools
TOOLS_LIB_DEPENDS=libicui18n.so:devel/icu \ TOOLS_LIB_DEPENDS=libicui18n.so:devel/icu \
libfontconfig.so:x11-fonts/fontconfig libfontconfig.so:x11-fonts/fontconfig
TOOLS_USES= compiler:c++11-lib
TOOLS_USE= GNOME=cairo,glib20,pango TOOLS_USE= GNOME=cairo,glib20,pango
post-patch: post-patch:

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1544717557 TIMESTAMP = 1562588745
SHA256 (tesseract-ocr-tesseract-4.0.0_GH0.tar.gz) = a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd SHA256 (tesseract-ocr-tesseract-4.1.0_GH0.tar.gz) = 5c5ed5f1a76888dc57a83704f24ae02f8319849f5c4cf19d254296978a1a1961
SIZE (tesseract-ocr-tesseract-4.0.0_GH0.tar.gz) = 1961372 SIZE (tesseract-ocr-tesseract-4.1.0_GH0.tar.gz) = 1965053

View file

@ -3,13 +3,12 @@ libpthread. Look for a symbol that causes us to load it.
libtesseract.so is not linked against libomp if openmp is enabled, libtesseract.so is not linked against libomp if openmp is enabled,
which makes dependent ports fail. This adds a workaround by linking which makes dependent ports fail. This adds a workaround by linking
directly against libomp. directly against libomp.
--- configure.ac.orig 2019-03-26 21:58:42 UTC --- configure.ac.orig 2019-07-07 12:34:08 UTC
+++ configure.ac +++ configure.ac
@@ -375,6 +375,10 @@ CXXFLAGS="$OLD_CXXFLAGS" @@ -372,6 +372,9 @@ esac
# ---------------------------------------- # ----------------------------------------
AC_SEARCH_LIBS([sem_init], [pthread rt]) AC_SEARCH_LIBS([pthread_create], [pthread])
+AC_SEARCH_LIBS([pthread_create], [pthread])
+if test "$enable_openmp" != no; then +if test "$enable_openmp" != no; then
+ AC_SEARCH_LIBS([omp_get_thread_num ], [omp]) + AC_SEARCH_LIBS([omp_get_thread_num ], [omp])
+fi +fi

View file

@ -1,15 +0,0 @@
--- doc/Makefile.am.orig 2019-03-28 05:11:18 UTC
+++ doc/Makefile.am
@@ -36,7 +36,11 @@ EXTRA_DIST = $(man_MANS) Doxyfile
html: $(patsubst %,%.html,$(man_MANS))
%: %.asc
- $(asciidoc) -o $@ $<
+ $(asciidoc) $<
+ $(asciidoc) -b docbook $<
+ %%LOCALBASE%%/bin/xsltproc --nonet --param man.charmap.use.subset "0" \
+ %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl \
+ $@.xml
%.html: %.asc
asciidoc -b html5 -o $@ $<

View file

@ -0,0 +1,10 @@
--- src/ccutil/ocrclass.h.orig 2019-07-08 13:00:14 UTC
+++ src/ccutil/ocrclass.h
@@ -31,6 +31,7 @@
#ifdef _WIN32
#include <winsock2.h> // for timeval
#endif
+#include <sys/time.h>
/**********************************************************************
* EANYCODE_CHAR

View file

@ -22,7 +22,6 @@ include/tesseract/baseapi.h
include/tesseract/capi.h include/tesseract/capi.h
include/tesseract/genericvector.h include/tesseract/genericvector.h
include/tesseract/helpers.h include/tesseract/helpers.h
include/tesseract/host.h
include/tesseract/ltrresultiterator.h include/tesseract/ltrresultiterator.h
include/tesseract/ocrclass.h include/tesseract/ocrclass.h
include/tesseract/osdetect.h include/tesseract/osdetect.h
@ -40,7 +39,7 @@ include/tesseract/unichar.h
lib/libtesseract.a lib/libtesseract.a
lib/libtesseract.so lib/libtesseract.so
lib/libtesseract.so.4 lib/libtesseract.so.4
lib/libtesseract.so.4.0.0 lib/libtesseract.so.4.0.1
libdata/pkgconfig/tesseract.pc libdata/pkgconfig/tesseract.pc
man/man1/ambiguous_words.1.gz man/man1/ambiguous_words.1.gz
man/man1/classifier_tester.1.gz man/man1/classifier_tester.1.gz