From a49ce9f43935eb28e48041989fd068ffb2a4dec3 Mon Sep 17 00:00:00 2001 From: Christoph Moench-Tegeder Date: Wed, 30 Jun 2021 19:39:23 +0200 Subject: [PATCH] cad/freecad: follow opencascade's switch to vtk9 this pulls in upstream commit 0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25 "Make smesh compile with vtk9" and switches FreeCAD's own dependencies --- cad/freecad/Makefile | 9 ++++++--- cad/freecad/distinfo | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index c173b88dde18..0bae2690f9e5 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,11 +1,14 @@ PORTNAME= FreeCAD DISTVERSION= 0.19.2 -PORTREVISION= 1 +PORTREVISION= 2 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e CATEGORIES= cad +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25.patch:-p1 + MAINTAINER= cmt@FreeBSD.org COMMENT= General purpose 3D CAD modeller @@ -22,7 +25,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libCoin.so:graphics/Coin \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libvtkFiltersTexture-8.2.so:math/vtk8 \ + libvtkFiltersTexture-9.0.so:math/vtk9 \ libTKernel.so:cad/opencascade \ libxerces-c.so:textproc/xerces-c3 \ libboost_thread.so:devel/boost-libs \ @@ -55,7 +58,7 @@ CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \ -DPYSIDE2RCCBINARY="${LOCALBASE}/bin/rcc" \ -DPYSIDE2UICBINARY="${LOCALBASE}/bin/uic" \ - -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2 + -DVTK_DIR:PATH=${LOCALBASE}/lib/cmake/vtk-9.0 CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} diff --git a/cad/freecad/distinfo b/cad/freecad/distinfo index 9c0a49aae4b7..6192d5964f9d 100644 --- a/cad/freecad/distinfo +++ b/cad/freecad/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1619964737 +TIMESTAMP = 1625066998 SHA256 (FreeCAD-FreeCAD-0.19.2_GH0.tar.gz) = 47e39e3d6fcafe6e0c68923fb1b86acda16986268e5e6011694057b940139fba SIZE (FreeCAD-FreeCAD-0.19.2_GH0.tar.gz) = 296987961 +SHA256 (0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25.patch) = 71a2ad3bc210281d151add9e73beab78eaa1cc6d94bf97db865b4171f8d56d4d +SIZE (0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25.patch) = 34604 -- 2.32.0