Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Apr 2024 09:15:59 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e59794418b3c - main - graphics/f3d: Fix plist and LIB_DEPENDS
Message-ID:  <202404050915.4359FxQE067376@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e59794418b3c744229f3e4f2bfeb56c83efd5913

commit e59794418b3c744229f3e4f2bfeb56c83efd5913
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-04-05 09:14:15 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-04-05 09:15:40 +0000

    graphics/f3d: Fix plist and LIB_DEPENDS
    
    Reported by:    Vladimir Druzenko <vvd@freebsd.org>
---
 graphics/f3d/Makefile  | 8 ++++----
 graphics/f3d/pkg-plist | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile
index b11862b7c07b..64f25af610cf 100644
--- a/graphics/f3d/Makefile
+++ b/graphics/f3d/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	f3d
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -15,7 +16,6 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg4 \
 		libfreeimage.so:graphics/freeimage \
 		libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
-		libImath-3_1.so:math/Imath \
 		libinotify.so:devel/libinotify \
 		libnetcdf.so:science/netcdf \
 		libtbb.so:devel/onetbb \
@@ -46,7 +46,8 @@ MODULES_DESC=			Build modules:
 
 ALEMBIC_DESC=			Alembic plugin (for ABC files)
 ALEMBIC_CMAKE_BOOL=		F3D_PLUGIN_BUILD_ALEMBIC
-ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
+ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic \
+				libImath-3_1.so:math/Imath
 
 ASSIMP_DESC=			Assimp plugin (for FBX, OFF, DAE and DXF files)
 ASSIMP_CMAKE_BOOL=		F3D_PLUGIN_BUILD_ASSIMP
@@ -66,8 +67,7 @@ EXTERNAL_RENDERING_BROKEN=	Requires VTK::RenderingExternal enabled in VTK
 OCCT_DESC=			OpenCASCADE plugin (for STEP and IGES files)
 OCCT_USES=			localbase:ldflags
 OCCT_CMAKE_BOOL=		F3D_PLUGIN_BUILD_OCCT
-OCCT_LIB_DEPENDS=		libTKBRep.so:cad/opencascade \
-				libdraco.so:archivers/draco
+OCCT_LIB_DEPENDS=		libTKBRep.so:cad/opencascade
 OCCT_CMAKE_ON=			-DOpenCASCADE_DIR=${LOCALBASE}/lib/cmake
 
 RAYTRACING_DESC=		Raytracing module
diff --git a/graphics/f3d/pkg-plist b/graphics/f3d/pkg-plist
index cfd02f534d6f..cfcf91ed6ef6 100644
--- a/graphics/f3d/pkg-plist
+++ b/graphics/f3d/pkg-plist
@@ -45,11 +45,11 @@ lib/libf3d.so
 lib/libf3d.so.2
 lib/libf3d.so.2.4
 lib/libvtkext.so
-lib/libvtkextAlembic.a
-lib/libvtkextAssimp.a
-lib/libvtkextDraco.a
+%%ALEMBIC%%lib/libvtkextAlembic.a
+%%ASSIMP%%lib/libvtkextAssimp.a
+%%DRACO%%lib/libvtkextDraco.a
 lib/libvtkextNative.a
-lib/libvtkextOCCT.a
+%%OCCT%%lib/libvtkextOCCT.a
 lib/libvtkextPrivate.a
 lib/vtk/hierarchy/f3d_vtkext/vtkext-hierarchy.txt
 %%ALEMBIC%%share/applications/f3d-plugin-alembic.desktop



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404050915.4359FxQE067376>