From nobody Fri Jan 28 11:42:25 2022 X-Original-To: dev-commits-ports-main@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 7B1261979F02; Fri, 28 Jan 2022 11:42:25 +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 4JlbD134vRz4tXS; Fri, 28 Jan 2022 11:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643370145; 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=FdDsfaukUgo17yFIJDmLanSta6eELM5j7qB3YXe7EqY=; b=KwdsZW0mOOlv3pHr/KZK/10oOO5kD/Qf3Ut46jxDUaPeQRrFiRYP3aLBUbb8kzoYozjRjV soSskcJmTQHIYc5AsKfNFsy4KdmFewhL+Euny9yIolPugT226q9F9dAaiB/5wDCUUv+r0P 41Dp9aB2mMfCv6zO7dvF3R159FzSLpX0c08b07RwhHBMMZiEOq3kjlJ6X24xfkd19dg/lI shSZwU4bdxBzBq5iGMO/cRCwodZxAU8PiYBUqilvF2ksP0Xd/FGwOZAk//nM6Jao1st8CD iBOjezskgOozcov5WH/dOsTlYl7+oNhRHyK0vnWmNLPv98YIczk5q5Mj7Ad6fg== 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 47E2B292E6; Fri, 28 Jan 2022 11:42:25 +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 20SBgPKr052512; Fri, 28 Jan 2022 11:42:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20SBgPNZ052511; Fri, 28 Jan 2022 11:42:25 GMT (envelope-from git) Date: Fri, 28 Jan 2022 11:42:25 GMT Message-Id: <202201281142.20SBgPNZ052511@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: b5ce2eb869cf - main - graphics/opencv: fix VTK option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5ce2eb869cf89fe02e6954ddd72e1127e7bdf1f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643370145; 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=FdDsfaukUgo17yFIJDmLanSta6eELM5j7qB3YXe7EqY=; b=jY935ChBGoFmp9WC+4gNLqaWn6LDE+7DhtT76CDRYv1csi+snRd3sjL4AcMAQlY1dYfk80 1iSGGb0iBADShTXEzXix5G+aZApNmgIZng2d1WmrUQ6rWvNucNn43oD7Bas8kodHt9MXWq zTKyx7RGdK4OOJAwBe1nJ5kj+3KiD0RhegUgMMcCF2mQxxxMhNvTVdMth6ZNnluT7pR2uI oV8rWd+szwf3uOfsZxZ/bot8WserLaNFPFImG14sgkYT11UJxLWet1NFTW/eHRp8/dhWey okqirWHFwJNx0b7Si6+B4AAPjUyy2b6b7+NwDzkSFySDz/QnfsZ2keN86UdMoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643370145; a=rsa-sha256; cv=none; b=FR0rVi9E24UoZy57gedBGPsUJ48QfXLFcxLpxMCj7zMPrRDItv1i3mcMhBT1p6lyxIzfx1 o+mrHtYx4RPMXvTvf5b/xPJnfoF7XL3bTBqqyg4zzBsKJU+dzvQCr9czyX8yMu2RSKkKd6 cclCUSU28xwp6A0JX9ZrgsZPQmIJ/WocRW6embke2QuL+E1+M8U0nf1jXRErmUbOp9ZVzm RcujvITkkTU1MonAO0wOGWUh/3ncSiE4mGvuJRNkqMROPZVtKcuBVNVaBY4pqjQU1WaplK zp+O32bS+U7Nbw/NgdWRUxumyqKaF/Smv2y0Qmy/g98NbFxjWRogCgsTqDHO5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5ce2eb869cf89fe02e6954ddd72e1127e7bdf1f commit b5ce2eb869cf89fe02e6954ddd72e1127e7bdf1f Author: Tobias C. Berner AuthorDate: 2022-01-28 11:40:44 +0000 Commit: Tobias C. Berner CommitDate: 2022-01-28 11:42:16 +0000 graphics/opencv: fix VTK option As VTK is built with Qt5 support, bring in the required dependencies for the build system. Submitted by: Oleg Sidorkin PR: 261519 --- graphics/opencv/Makefile | 2 ++ graphics/opencv/pkg-plist | 3 +++ 2 files changed, 5 insertions(+) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 2b1b6b5ea444..180d1a26afc7 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -120,6 +120,8 @@ GTK3_CMAKE_BOOL= WITH_GTK VTK_DESC= Include VTK library support (build opencv_viz module) VTK_CMAKE_BOOL= WITH_VTK VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9 +VTK_USES= qt:5 +VTK_USE= QT=buildtools_build,qmake_build ### # IMAGE group options (GPHOTO2 JPEG OPENEXR PNG TIFF) diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist index 68706cd34d54..1b37924e900a 100644 --- a/graphics/opencv/pkg-plist +++ b/graphics/opencv/pkg-plist @@ -719,6 +719,9 @@ lib/libopencv_videoio.so.405 lib/libopencv_videostab.so lib/libopencv_videostab.so.%%SHLIB_VER%% lib/libopencv_videostab.so.405 +%%VTK%%lib/libopencv_viz.so +%%VTK%%lib/libopencv_viz.so.%%SHLIB_VER%% +%%VTK%%lib/libopencv_viz.so.405 %%PROTOBUF%%lib/libopencv_wechat_qrcode.so %%PROTOBUF%%lib/libopencv_wechat_qrcode.so.%%SHLIB_VER%% %%PROTOBUF%%lib/libopencv_wechat_qrcode.so.405