Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Mar 2024 18:02:19 GMT
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ffcb78d4aa38 - main - cad/PrusaSlicer: add support of OpenCascade
Message-ID:  <202403211802.42LI2Jh4023535@gitrepo.freebsd.org>

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

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

commit ffcb78d4aa3842e02972dfbe70dd64facb684abf
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2024-03-17 20:41:41 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2024-03-21 18:01:18 +0000

    cad/PrusaSlicer: add support of OpenCascade
    
    Patch from OpenBSD by Johannes Thyssen Tishman.
    
    PR:             277313
    Approved by:    teodorsigaev (maintainer)
---
 cad/PrusaSlicer/Makefile                                |  6 ++----
 cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvg.h    |  4 ++--
 .../files/patch-src_libnanosvg_nanosvgrast.h            |  4 ++--
 .../files/patch-src_occt__wrapper_CMakeLists.txt        | 17 ++++++++++++-----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile
index 936e76216daf..12c5d5f1fa6d 100644
--- a/cad/PrusaSlicer/Makefile
+++ b/cad/PrusaSlicer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	PrusaSlicer
 DISTVERSIONPREFIX=version_
 DISTVERSION=	2.6.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	cad
 DIST_SUBDIR=	PrusaSlicer
 
@@ -12,8 +12,6 @@ WWW=		https://www.prusa3d.com/prusaslicer/
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		fails to build, error: no member named 'prior' in namespace 'boost'
-
 BUILD_DEPENDS=	cereal>=1.3.0.10:devel/cereal \
 		cgal>=5.0.2:math/cgal \
 		opencascade>=7.7.0:cad/opencascade
@@ -31,7 +29,7 @@ LIB_DEPENDS=	libtbb.so:devel/onetbb \
 		libmpfr.so:math/mpfr \
 		libdbus-1.so:devel/dbus \
 		libpng.so:graphics/png \
-		libTKXDESTEP.so:cad/opencascade \
+		libTKXSDRAWSTEP.so:cad/opencascade \
 		libtiff.so:graphics/tiff \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreeimage.so:graphics/freeimage \
diff --git a/cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvg.h b/cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvg.h
index 08bf0beb1ef1..90f9ef46e777 100644
--- a/cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvg.h
+++ b/cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvg.h
@@ -1,5 +1,5 @@
---- src/libnanosvg/nanosvg.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ src/libnanosvg/nanosvg.h	2022-12-22 00:42:08.000000000 +0100
+--- src/libnanosvg/nanosvg.h.orig	2024-03-17 16:57:39 UTC
++++ src/libnanosvg/nanosvg.h
 @@ -0,0 +1,3106 @@
 +/*
 + * Copyright (c) 2013-14 Mikko Mononen memon@inside.org
diff --git a/cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvgrast.h b/cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvgrast.h
index 11167f59d0ad..7a4e757402ff 100644
--- a/cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvgrast.h
+++ b/cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvgrast.h
@@ -1,5 +1,5 @@
---- src/libnanosvg/nanosvgrast.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ src/libnanosvg/nanosvgrast.h	2022-12-22 00:42:08.000000000 +0100
+--- src/libnanosvg/nanosvgrast.h.orig	2024-03-17 16:57:40 UTC
++++ src/libnanosvg/nanosvgrast.h
 @@ -0,0 +1,1482 @@
 +/*
 + * Copyright (c) 2013-14 Mikko Mononen memon@inside.org
diff --git a/cad/PrusaSlicer/files/patch-src_occt__wrapper_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_occt__wrapper_CMakeLists.txt
index eb855efb6915..562dec3deff8 100644
--- a/cad/PrusaSlicer/files/patch-src_occt__wrapper_CMakeLists.txt
+++ b/cad/PrusaSlicer/files/patch-src_occt__wrapper_CMakeLists.txt
@@ -1,6 +1,6 @@
 --- src/occt_wrapper/CMakeLists.txt.orig	2023-06-19 12:07:14 UTC
 +++ src/occt_wrapper/CMakeLists.txt
-@@ -19,9 +19,11 @@ generate_export_header(OCCTWrapper)
+@@ -19,14 +19,13 @@ generate_export_header(OCCTWrapper)
  
  generate_export_header(OCCTWrapper)
  
@@ -9,11 +9,18 @@
 +find_package(OpenCASCADE REQUIRED)
  
  set(OCCT_LIBS
+-    TKXDESTEP
+-    TKSTEP
+-    TKSTEP209
+-    TKSTEPAttr
+-    TKSTEPBase
 +	-L${CMAKE_INSTALL_PREFIX}/lib
-     TKXDESTEP
-     TKSTEP
-     TKSTEP209
-@@ -58,5 +60,5 @@ include(GNUInstallDirs)
++    TKXSDRAWSTEP
++    TKDESTEP
+     TKXCAF
+     TKXSBase
+     TKVCAF
+@@ -58,5 +57,5 @@ include(GNUInstallDirs)
  
  include(GNUInstallDirs)
  



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