From nobody Thu Mar 21 18:02:19 2024 X-Original-To: dev-commits-ports-main@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 4V0tb01bCVz5FB72; Thu, 21 Mar 2024 18:02:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0tb00hN7z46B1; Thu, 21 Mar 2024 18:02:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711044140; 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=PfI7dvg6d3HB2/IrlG9lVMmQXwa9juRyYEZ7NytcW9Y=; b=CF6wpjo7s8Y/Iv2RcKOEDrDqZPB/HNzLxFlXSPJK/OY/zRpJaZoMCciFKS9i60cJ6j7YK7 JmyYyjFw5EgVGCYmFovZ/aBizUmidsQOMpsfOKkWeasg59dqufWNGQ5hLmp2SJODXnLvZS IXuOEt9Itp+Q+NJzfFaAnwoLMaJrm1UJL7KLIs+aSafJhSxWpOq5+WWeol/HNapDT+dnEZ sry9MEx6YJI0Gz/MaEhcRZKZx+Oayq6nY3TwaN1Uzi5vbQ/w6BYVC/pg8h6SzagR9hf/6f jx2r6ooaEQKgD8gRGUr/nkn8zToFSP+cKYvwvMPq67wRBKnuqQqRe3HVJqhbKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711044140; a=rsa-sha256; cv=none; b=Ci1T2VHbVjsY63ZvTBgnEZHoA5S6Jp8+uolXj7p2GlBP+gsMpngnnXKPJGZb97cG9QFQpe C+Cmgic3rEBPg023F16hfHeCBZVAML4AGcvXIalcB/gkChMAyj6NT8C3tNCMJJYdSnx0pU ZEur7aWOSCk/yygznlTIQGLBS3exEXheXQBnc8ratTETuBHOn2HepikGSODdWiBYQPBBza vdSMxxGAa2kDBa5/Nwfnn7Ai+UwgtT0Noj+hifTSHGwqODITGLTi1TUaYnCZaUvYpKpe/8 VU/0+//ZIUOTxrMxJ9Es9rNKZZb3juDhFH+QOvEPIp/no0BauAcrU4JCdg2DgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711044140; 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=PfI7dvg6d3HB2/IrlG9lVMmQXwa9juRyYEZ7NytcW9Y=; b=IEP7cwIZlJnlbKvo+aypKI2LigQcM7nS8VnYcMSomt6gqzCRGqpM/NLUCx1IpnBvjOwS+1 cPaBLOj0dDUIhCXqnN2nwcF2YmwOuvEIQ4l7Q3KkG8fSOzKFFBDEoCHGi0lCsEoqgs449F usDlpxk8LFgVf3uyZd7Mh2QYrQsgJtKuPugwIl+DLLs3WCyKsC7g0rrB5i/7m0vqyO7pdB ulcxDFpOkXGi1yqRIGJNY3r8Z69hOmVOkoltZpsL5D7zH+U6NGRBmEFb+fCl1YnRWPYIm5 ygwrmYxh65TQR2oDuF5EVsEXuXOTYwv0zlA55aWU+UIXmL1kgZasyfmg/eKNFQ== 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 4V0tb004cyzm3f; Thu, 21 Mar 2024 18:02:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42LI2Jfi023538; Thu, 21 Mar 2024 18:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LI2Jh4023535; Thu, 21 Mar 2024 18:02:19 GMT (envelope-from git) Date: Thu, 21 Mar 2024 18:02:19 GMT Message-Id: <202403211802.42LI2Jh4023535@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: ffcb78d4aa38 - main - cad/PrusaSlicer: add support of OpenCascade List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffcb78d4aa3842e02972dfbe70dd64facb684abf Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=ffcb78d4aa3842e02972dfbe70dd64facb684abf commit ffcb78d4aa3842e02972dfbe70dd64facb684abf Author: Thierry Thomas AuthorDate: 2024-03-17 20:41:41 +0000 Commit: Thierry Thomas 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)