From nobody Sat Apr 09 18:03:56 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1607E1AAED0B; Sat, 9 Apr 2022 18:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KbNKT04jMz3Nrp; Sat, 9 Apr 2022 18:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649527437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TeXaCRWHUkP8j9aK+NIv866JEBym2036lU2DiJAG3YE=; b=k4QOzSuEdbtsBCeTjJiyLHgDhHHFi8VsEB8lYbHNrs7XM9fTDZQfiX23npK/yB5TTbwpHC SS//mlzH/5jWRH2C7m3Dmh1EXsDnftu06VOGdWSOBYqO/DY97N/8QTLC7zMcKqPoJEt4uo ah2O5nqPdO68SW+MP1k7eLiTNnPCAFEpOoilGmECJ8tICzfIHkcHybpaQRJmFEDsYHeOjr z2KzPU+Z2MENNODUZbauXHwXV8nzQAF+qQAj2ahi5Nm9/tSzkuZnmoOecEAbLpmPOrw8WC BZachieRKbGpuF66jxY9op1LdAjB42LAIIwnRS8gGPwUSLSJ4nd/58hGIPYdRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D6BA81EC5C; Sat, 9 Apr 2022 18:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 239I3uc8097701; Sat, 9 Apr 2022 18:03:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 239I3uc8097700; Sat, 9 Apr 2022 18:03:56 GMT (envelope-from git) Date: Sat, 9 Apr 2022 18:03:56 GMT Message-Id: <202204091803.239I3uc8097700@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 9205101df1ed - main - graphics/opencv: add TESSERACT option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9205101df1ed3f52d833805bd2ba49b986462261 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649527437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TeXaCRWHUkP8j9aK+NIv866JEBym2036lU2DiJAG3YE=; b=ifQ/RmX0lzGUg5kXphNsRLAF/Ng3IoE5TvzfmTcxZi4kMBR0quKBXY92/mTv1PHE8FzOzh fvgJvuvspurRvwvM93lb37dgvnGgwXefgnsvwLDh22Z/0qqvge2q50Xxi1FkVLCSXIXkqS Lus3NG7a5YHCNa/WH4VBbFz8nOtyicmuLwdTbHC6NjGAqMbCX9Y275xKdV8Jpv4UDuddps QgQB52JYQ1z3Slb6H4afTMeDs8+1jKeGLFGyj3SjmCS9iShDbUwPEGl5LUkA9Kmu70qbcT lOr3xY/0i9TaBL297EOD0WMUhwzFQu4u+sXXh2jYjxinb5w4Y4TY1+JkVkQ3oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649527437; a=rsa-sha256; cv=none; b=OvnPrAhR8Nt6s2cxfzhpli/RyGBNFhu9FWWxH7ULgCZ/LE70EzrnKVKLXxJVYshd/Ju1ai PDXwogE4pKwosUJwZ8dEDrAi5C+Lmwrrrvx1PSwL9/hXCLvug7hqI8Fx/MTVikPuAeLLSS ZIj8LGa/t5CrUyRWQjIfl7GW3cF3qrlgNTS6w8GUXkOE7D6oSAaO/sfInzxNPcIsXIk1Wg tQsVLXAOrzencgX8lB+ezRRQWG4Hr2gDRmaCTLjRzbkc7jnikNSfInIEe1rC9+4/GNjQr9 ov9b54mzv9JcknYj/wcBZqSQjiBFG+2Enht8ddYn43wAVP1nTefRl0LBhWP1JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=9205101df1ed3f52d833805bd2ba49b986462261 commit 9205101df1ed3f52d833805bd2ba49b986462261 Author: Adriaan de Groot AuthorDate: 2022-04-09 18:00:19 +0000 Commit: Adriaan de Groot CommitDate: 2022-04-09 18:03:54 +0000 graphics/opencv: add TESSERACT option Tesseract support was explicitly turned off previously, because in a dirty build environment it would pick up an existing installation and then break. In the meantime, opencv and leptonica have been updated, and Tesseract behaves well in combination with opencv. Make it an option, default off (corresponding to previous behavior). While here, hand off to desktop@ at tcberner's request. PR: 259930 --- graphics/opencv/Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index e229ffb095ca..ac69d63c79fd 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,9 +1,9 @@ PORTNAME= opencv DISTVERSION= 4.5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics -MAINTAINER= tcberner@FreeBSD.org +MAINTAINER= desktop@FreeBSD.org COMMENT= Open Source Computer Vision library LICENSE= BSD3CLAUSE @@ -35,15 +35,15 @@ GH_TAGNAME= v0.1.1f:ade \ CMAKE_ON= OPENCV_GENERATE_PKGCONFIG CMAKE_OFF= OPENCV_GENERATE_SETUPVARS \ BUILD_opencv_python2 \ - BUILD_TESTS \ - WITH_TESSERACT + BUILD_TESTS CMAKE_ARGS= -DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules" DATADIR= ${PREFIX}/share/${PORTNAME}4 PLIST_SUB= SHLIB_VER=${DISTVERSION} -OPTIONS_DEFINE= EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB +OPTIONS_DEFINE= EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL \ + PATENTED PROTOBUF PYTHON TBB TESSERACT OPTIONS_GROUP= GUI IMAGE VIDEO OPTIONS_GROUP_GUI= GTK3 VTK @@ -110,6 +110,10 @@ PYTHON_CMAKE_ON= -DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR} TBB_DESC= Add Intel Threading Building Blocks Support TBB_CMAKE_BOOL= WITH_TBB TBB_LIB_DEPENDS= libtbb.so:devel/tbb + +TESSERACT_DESC= Add Tesseract-based OCR +TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract +TESSERACT_CMAKE_BOOL= WITH_TESSERACT ### # GUI group options (GTK3 VTK)