Skip to content

Commit

Permalink
graphics/f3d: upgrade to 2.3.0
Browse files Browse the repository at this point in the history
Release notes at <https://github.com/f3d-app/f3d/releases/tag/v2.3.0>.

Also fix with OpenCascade 7.8.0:
See <f3d-app/f3d#1304>.

PR:		277308
Approved by:	yuri (maintainer)
  • Loading branch information
thierry-FreeBSD committed Mar 21, 2024
1 parent d0646a9 commit fea2226
Show file tree
Hide file tree
Showing 5 changed files with 432 additions and 6 deletions.
11 changes: 9 additions & 2 deletions graphics/f3d/Makefile
@@ -1,6 +1,6 @@
PORTNAME= f3d
DISTVERSIONPREFIX= v
DISTVERSION= 2.2.1
DISTVERSION= 2.3.0
CATEGORIES= graphics

MAINTAINER= yuri@FreeBSD.org
Expand All @@ -11,17 +11,24 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md

LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg4 \
libexpat.so:textproc/expat2 \
libfontconfig.so:x11-fonts/fontconfig \
libfreeimage.so:graphics/freeimage \
libfreetype.so:print/freetype2 \
libhdf5.so:science/hdf5 \
libImath-3_1.so:math/Imath \
libjpeg.so:graphics/jpeg-turbo \
libnetcdf.so:science/netcdf \
libpng.so:graphics/png \
libtbbmalloc.so:devel/onetbb \
libtiff.so:graphics/tiff \
libvtkCommonMisc-${VTK_VER}.so:math/vtk${VTK_VER:R}

USES= cmake:testing compiler:c++17-lang desktop-file-utils gl shared-mime-info tcl tk xorg
USES= cmake:testing compiler:c++17-lang desktop-file-utils gl mpi \
shared-mime-info tcl tk xorg
USE_GL= gl glu
USE_XORG= ice sm x11 xt
USE_LDCONFIG= yes

USE_GITHUB= yes
GH_ACCOUNT= f3d-app
Expand Down
6 changes: 3 additions & 3 deletions graphics/f3d/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1704769349
SHA256 (f3d-app-f3d-v2.2.1_GH0.tar.gz) = 4d3a73b0107c8db7f0556107c74087d3748232a73981f65f7c5186ac1003ec8d
SIZE (f3d-app-f3d-v2.2.1_GH0.tar.gz) = 29785716
TIMESTAMP = 1709891821
SHA256 (f3d-app-f3d-v2.3.0_GH0.tar.gz) = 9c2906b62f3066f075effbabd6501964391e8a8ffad6ed773c33db12580cc466
SIZE (f3d-app-f3d-v2.3.0_GH0.tar.gz) = 40606315
35 changes: 35 additions & 0 deletions graphics/f3d/files/patch-plugins_occt_CMakeLists.txt
@@ -0,0 +1,35 @@
--- plugins/occt/CMakeLists.txt.orig 2024-01-21 15:29:01 UTC
+++ plugins/occt/CMakeLists.txt
@@ -17,18 +17,30 @@ endif()
message(FATAL_ERROR "Plugin: OpenCASCADE: ${OpenCASCADE_VERSION} is not supported by F3D, please update your OpenCASCADE installation.")
endif()

-if((NOT TARGET "TKSTEP") AND (NOT TARGET "TKIGES") AND (NOT TARGET "TKMesh"))
+if("${OpenCASCADE_VERSION}" VERSION_LESS "7.8.0")
+ if((NOT TARGET "TKSTEP") AND (NOT TARGET "TKIGES") AND (NOT TARGET "TKMesh"))
message(FATAL_ERROR "Plugin: OpenCASCADE does not contain required modules")
+ endif()
endif()

+if((NOT TARGET "TKDESTEP") AND (NOT TARGET "TKDEIGES") AND (NOT TARGET "TKMesh"))
+ message(FATAL_ERROR "Plugin: OpenCASCADE does not contain required modules")
+endif()
+
message(STATUS "Plugin: OpenCASCADE ${OpenCASCADE_VERSION} found")

option(F3D_PLUGIN_OCCT_COLORING_SUPPORT "Enable coloring support in occt plugin" ON)
mark_as_advanced(F3D_PLUGIN_OCCT_COLORING_SUPPORT)

if(F3D_PLUGIN_OCCT_COLORING_SUPPORT)
- if (NOT (TARGET "TKXDESTEP") OR NOT (TARGET "TKXDEIGES"))
+ if("${OpenCASCADE_VERSION}" VERSION_LESS "7.8.0")
+ if (NOT (TARGET "TKXDESTEP") OR NOT (TARGET "TKXDEIGES"))
message(FATAL_ERROR "occt plugin: TKXDESTEP and TKXDEIGES OCCT modules are not found. Turn off F3D_PLUGIN_OCCT_COLORING_SUPPORT or enable them in your OpenCascade build.")
+ endif()
+ else()
+ if (NOT (TARGET "TKXSDRAWSTEP") OR NOT (TARGET "TKXSDRAWIGES"))
+ message(FATAL_ERROR "occt plugin: TKXSDRAWSTEP and TKXSDRAWIGES OCCT modules are not found. Turn off F3D_PLUGIN_OCCT_COLORING_SUPPORT or enable them in your OpenCascade build.")
+ endif()
endif()
endif()

0 comments on commit fea2226

Please sign in to comment.