From nobody Fri Sep 27 15:00:47 2024 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 4XFYYq5fthz5Y60R; Fri, 27 Sep 2024 15:00:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XFYYq3yjKz58Q0; Fri, 27 Sep 2024 15:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727449247; 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=rPOpgmf8hUatJXTGWlpIooGnuNAfJiFt5G2zVSrTiBc=; b=dEweB5Z5CS7MF2r/re6maBUsoSMNEGVyUC+Dx3oqTDQHqFNRpUK93mz5zBbvVrV0CMLz3L S8ueXBAIuM2AVJm88uKixFRgr7WkazeEMJwjc0T3H9YuPauoq5GyKIV72b+htkeSV9K8Kb +ZZ6YGcnlio1E0IpxA49veCnTYJ/uYdwafdSAjG6San4+gurTBNELiU+QFkGegHffQC1HT +0gH7a0mN3BswKTJq3Zb63laMKu0VPUBqZ0mTTdGJH0FvROJl212bs4vYvWLt3jcwKHo6r 8+6P6BnLv1q054tUMaxAxplDtAhDRo5n+b2oZetT9IaZPms9hX6axllG//8pPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727449247; 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=rPOpgmf8hUatJXTGWlpIooGnuNAfJiFt5G2zVSrTiBc=; b=HbIWhnfuRMaH86RcSm8Lv92YJrE4NqjjDisZviJdcDjqpkxnicCtOu4giDMwGjTi4CVoVn 7QKDtqDbi4g7xNcLF1KDKqBKc6DnzwXV5b6cJSJScG10JQLOVDe9kAZzmRIKP3HBQHAhQx AuirSBaES0n8KP6uyP8iEsl0IslEmXqpgoVoaE+Dn9A5Ppf5oPMP4Jlzp958MvBAUv7UyY 97hr1acciyGAXpr4Y7LvHnjSbgfN4J/dmvkQpu1izreksomFjUldlt33rDwAvSQYqLbzmi UvHaoQBQoiNOJxgW5uhbKzgWnZDyG0svbYC2fOMiFHEpeIoVKlwTPSWU2CH51A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727449247; a=rsa-sha256; cv=none; b=l9l5XHg30AFTD1F2ZS1+pilYSev8ErEd3cPrmF4f0nz8X7Mq14gic7kuJIp5JEThlvarn2 yf9syjUv/acctUAGXLh0K6iQnJtzdupQF8OqCbAZP9x/EnjQO44I0mBLMOzZudu9GRhcWd pw4DqQrAxcUVCebfFLcb51orLrj+SIJPpZw8cbs3VCXyPupAOOEOLOGZH0J6IxAFaAAZeL Yr2Ait8+o5U2TzkavULHXV4DFUpunbjdP9mV99mPJD1G09EXWPGGNf6sSHdhRHT4D+J6Da 6JNn2IA8mmNJJN+wftcLCOeuszQxTZ8H9UhdnohBY4LffNTn8uVAsyn4oQxZZQ== 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 4XFYYq3TPCzlW8; Fri, 27 Sep 2024 15:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48RF0lWl004496; Fri, 27 Sep 2024 15:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48RF0llE004493; Fri, 27 Sep 2024 15:00:47 GMT (envelope-from git) Date: Fri, 27 Sep 2024 15:00:47 GMT Message-Id: <202409271500.48RF0llE004493@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 37f9d06df180 - main - graphics/opencv: Add OGRE3D 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37f9d06df180a835d9f278584ad5245f6f3938f7 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=37f9d06df180a835d9f278584ad5245f6f3938f7 commit 37f9d06df180a835d9f278584ad5245f6f3938f7 Author: Jason E. Hale AuthorDate: 2024-09-27 14:40:55 +0000 Commit: Jason E. Hale CommitDate: 2024-09-27 15:00:42 +0000 graphics/opencv: Add OGRE3D option If graphics/ogre3d was installed on the system, the ovis module was being built, but not installed. The module was still added to the pkgconfig file, though, which is problematic for consumers of opencv using pkgconf such as graphics/gstreamer1-plugins-opencv. [1] Move gflags/glog deps to EIGEN option. Fix plist if ceres-solver is installed on the system. Elevate USES=gnome, so it that works for the two options that need it. PR: 278914 [1] Reported by: Chad Jacob Milios [1] --- graphics/opencv/Makefile | 16 ++++++++++------ graphics/opencv/pkg-plist | 5 +++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 40664bf4a515..e6391f41b582 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencv DISTVERSION= 4.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= desktop@FreeBSD.org @@ -11,12 +11,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libgflags.so:devel/gflags \ - libglog.so:devel/glog \ libharfbuzz.so:print/harfbuzz \ libhdf5.so:science/hdf5 -USES= cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig +USES= cmake compiler:c++14-lang cpe gnome localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= WeChatCV:wechat GH_PROJECT= opencv_contrib:contrib \ @@ -50,7 +48,7 @@ OPTIONS_DEFINE= EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL \ OPTIONS_GROUP= GUI IMAGE VIDEO OPTIONS_GROUP_GUI= GTK3 VTK -OPTIONS_GROUP_IMAGE= GPHOTO2 JPEG OPENEXR PNG TIFF +OPTIONS_GROUP_IMAGE= GPHOTO2 JPEG OGRE3D OPENEXR PNG TIFF OPTIONS_GROUP_VIDEO= DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE OPTIONS_SINGLE= BLAS @@ -69,6 +67,9 @@ OPTIONS_SUB= yes # Normal options (EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB) EIGEN_DESC= Add Eigen v3 Support, builds sfm modules EIGEN_CMAKE_BOOL= WITH_EIGEN +EIGEN_LIB_DEPENDS= libgflags.so:devel/gflags \ + libglog.so:devel/glog \ + libceres.so:math/ceres-solver EIGEN_USES= eigen:3 GDAL_DESC= Add Geospatial Data Abstraction Library Support @@ -119,7 +120,6 @@ TESSERACT_CMAKE_BOOL= WITH_TESSERACT ### # GUI group options (GTK3 VTK) -GTK3_USES= gnome GTK3_USE= gnome=gtk30,cairo,gdkpixbuf2 GTK3_CMAKE_BOOL= WITH_GTK @@ -139,6 +139,10 @@ JPEG_DESC= Add LibJpeg Support JPEG_CMAKE_BOOL= WITH_JPEG JPEG_USES= jpeg +OGRE3D_DESC= Add OGRE support +OGRE3D_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d +OGRE3D_CMAKE_BOOL= BUILD_opencv_ovis + OPENEXR_DESC= Add OpenEXR Support OPENEXR_CMAKE_BOOL= WITH_OPENEXR OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist index cbfc7246738b..f775249861bf 100644 --- a/graphics/opencv/pkg-plist +++ b/graphics/opencv/pkg-plist @@ -316,6 +316,7 @@ include/opencv4/opencv2/optflow/motempl.hpp include/opencv4/opencv2/optflow/pcaflow.hpp include/opencv4/opencv2/optflow/rlofflow.hpp include/opencv4/opencv2/optflow/sparse_matching_gpc.hpp +%%OGRE3D%%include/opencv4/opencv2/ovis.hpp include/opencv4/opencv2/phase_unwrapping.hpp include/opencv4/opencv2/phase_unwrapping/histogramphaseunwrapping.hpp include/opencv4/opencv2/phase_unwrapping/phase_unwrapping.hpp @@ -580,6 +581,9 @@ lib/libopencv_objdetect.so.409 lib/libopencv_optflow.so lib/libopencv_optflow.so.%%SHLIB_VER%% lib/libopencv_optflow.so.409 +%%OGRE3D%%lib/libopencv_ovis.so +%%OGRE3D%%lib/libopencv_ovis.so.%%SHLIB_VER%% +%%OGRE3D%%lib/libopencv_ovis.so.409 lib/libopencv_phase_unwrapping.so lib/libopencv_phase_unwrapping.so.%%SHLIB_VER%% lib/libopencv_phase_unwrapping.so.409 @@ -661,6 +665,7 @@ lib/libopencv_xphoto.so.409 %%EIGEN%%lib/opencv4/3rdparty/libcorrespondence.a %%EIGEN%%lib/opencv4/3rdparty/libmultiview.a %%EIGEN%%lib/opencv4/3rdparty/libnumeric.a +%%EIGEN%%lib/opencv4/3rdparty/libsimple_pipeline.a %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config-%%PYTHON_VER%%.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config.py