Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 07 May 2026 14:25:02 +0000
From:      Fernando Apeste=?utf-8?Q?gu=C3=ADa?= <fernape@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a569a6a8961f - main - cad/openvsp: Fix build with moderner libc++
Message-ID:  <69fca0be.2027f.7871f43d@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by fernape:

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

commit a569a6a8961fe59925013ffa661890fe0ec6ad2d
Author:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
AuthorDate: 2026-05-07 10:39:25 +0000
Commit:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
CommitDate: 2026-05-07 14:24:00 +0000

    cad/openvsp: Fix build with moderner libc++
    
    is_signed can't be specialized by users.
    
    While here, pet linters
    
    GH PR: https://github.com/OpenVSP/OpenVSP/pull/367
---
 cad/openvsp/Makefile                                         |  7 +++++--
 ..._GeometricTools_GeometricTools_GTE_Mathematics_BSNumber.h | 12 ++++++++++++
 cad/openvsp/files/patch-src_util_CMakeLists.txt              | 11 +++++++----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile
index 79f74f06529b..2211d9c82f7d 100644
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openvsp
 DISTVERSIONPREFIX=	${GH_PROJECT}_
 DISTVERSION=	3.50.1
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	fernape@FreeBSD.org
@@ -24,7 +25,6 @@ LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfltk.so:x11-toolkits/fltk \
 		libcpptest.so:devel/cpptest
-MAKE_JOBS_UNSAFE=yes
 
 USES=		cmake:noninja localbase \
 		gl gnome jpeg xorg
@@ -38,7 +38,6 @@ USES+=		compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	${GH_PROJECT}
 GH_PROJECT=	OpenVSP
-BINARY_ALIAS=	fltk::fluid=fluid
 
 USE_GL=		gl glew glu
 USE_GNOME=	libxml2
@@ -60,8 +59,12 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
 
 BUILD_PREFIX=	OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-${DISTVERSION}-FreeBSD
 
+MAKE_JOBS_UNSAFE=yes
+
 CXXFLAGS_powerpc64=	-mvsx
 
+BINARY_ALIAS=	fltk::fluid=fluid
+
 post-patch:
 	@${REINPLACE_CMD} 's/fltk::gl/fltk_gl/' ${WRKSRC}/src/CMakeLists.txt \
 		${WRKSRC}/src/vsp_aero/Viewer/CMakeLists.txt
diff --git a/cad/openvsp/files/patch-src_external_GeometricTools_GeometricTools_GTE_Mathematics_BSNumber.h b/cad/openvsp/files/patch-src_external_GeometricTools_GeometricTools_GTE_Mathematics_BSNumber.h
new file mode 100644
index 000000000000..80c5ed5f461f
--- /dev/null
+++ b/cad/openvsp/files/patch-src_external_GeometricTools_GeometricTools_GTE_Mathematics_BSNumber.h
@@ -0,0 +1,12 @@
+--- src/external/GeometricTools/GeometricTools/GTE/Mathematics/BSNumber.h.orig	2026-05-07 10:33:13 UTC
++++ src/external/GeometricTools/GeometricTools/GTE/Mathematics/BSNumber.h
+@@ -1387,9 +1387,6 @@ namespace std
+         return (gte::BSNumber<UInteger>)std::tanh((double)x);
+     }
+ 
+-    // Type trait that says BSNumber is a signed type.
+-    template <typename UInteger>
+-    struct is_signed<gte::BSNumber<UInteger>> : true_type {};
+ }
+ 
+ namespace gte
diff --git a/cad/openvsp/files/patch-src_util_CMakeLists.txt b/cad/openvsp/files/patch-src_util_CMakeLists.txt
index 663e0b29e8cc..9a92265052c0 100644
--- a/cad/openvsp/files/patch-src_util_CMakeLists.txt
+++ b/cad/openvsp/files/patch-src_util_CMakeLists.txt
@@ -1,7 +1,7 @@
---- src/util/CMakeLists.txt.orig	2024-03-22 17:20:53 UTC
+--- src/util/CMakeLists.txt.orig	2026-05-04 20:09:34 UTC
 +++ src/util/CMakeLists.txt
-@@ -21,6 +21,10 @@ INCLUDE_DIRECTORIES(
-     ${PCGCPP_INCLUDE_DIR}
+@@ -22,6 +22,10 @@ INCLUDE_DIRECTORIES(
+     ${GTE_INCLUDE_DIR}
      )
  
 +set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
@@ -11,9 +11,12 @@
  ADD_LIBRARY(util
  BndBox.cpp
  CADutil.cpp
-@@ -82,3 +86,5 @@ XferSurf.h
+@@ -76,6 +80,8 @@ XferSurf.h
  WriteMatlab.h
  XferSurf.h
  )
 +
 +target_link_libraries(util Threads::Threads)
+ 
+ target_link_libraries( util Eigen3::Eigen )
+ 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69fca0be.2027f.7871f43d>