diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 79f74f06529b..2211d9c82f7d 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -1,86 +1,89 @@ PORTNAME= openvsp DISTVERSIONPREFIX= ${GH_PROJECT}_ DISTVERSION= 3.50.1 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= fernape@FreeBSD.org COMMENT= Create a 3D model of an aircraft defined by engineering parameters WWW= http://www.openvsp.org/ LICENSE= NOSA13 LICENSE_NAME= NASA Open Source Agreement version 1.3 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= fails to compile: invokes x86 asm BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ pandoc:textproc/hs-pandoc LIB_DEPENDS= libdrm.so:graphics/libdrm \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 \ 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 .if !exists(/usr/include/omp.h) CXXFLAGS+= -fpermissive USES+= compiler:gcc-c++11-lib .else USES+= compiler:c++11-lang .endif USE_GITHUB= yes GH_ACCOUNT= ${GH_PROJECT} GH_PROJECT= OpenVSP -BINARY_ALIAS= fltk::fluid=fluid USE_GL= gl glew glu USE_GNOME= libxml2 USE_XORG= ice sm x11 xau xcb xcursor xdamage xdmcp xext xfixes xft \ xinerama xrender xxf86vm CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CODEELI:BOOLEAN=no \ -DVSP_USE_SYSTEM_EIGEN:BOOLEAN=no \ -DVSP_USE_SYSTEM_LIBXML2:BOOLEAN=yes \ -DVSP_USE_SYSTEM_FLTK:boolean=no \ -DCMAKE_PREFIX_PATH=/usr/local \ -DVSP_USE_SYSTEM_CMINPACK:boolean=no \ -DVSP_USE_SYSTEM_GLM:BOOLEAN=yes \ -DVSP_USE_SYSTEM_GLEW:BOOLEAN=yes CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} 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 do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vspIcon.png ${STAGEDIR}${DATADIR} ${RM} ${STAGEDIR}${PREFIX}/vspIcon.png ${BUILD_WRKSRC}/${BUILD_PREFIX}/vspIcon.png .for f in vsp vspaero vspaero_opt vsploads vspscript vspviewer ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/${f} ${STAGEDIR}${PREFIX}/bin ${RM} ${STAGEDIR}${PREFIX}/${f} .endfor .for d in CustomScripts airfoil matlab scripts textures (cd ${BUILD_WRKSRC}/${BUILD_PREFIX}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) ${RM} -rf ${STAGEDIR}${PREFIX}/${d} .endfor ${CP} ${BUILD_WRKSRC}/${BUILD_PREFIX}/LICENSE ${STAGEDIR}${DATADIR} ${CP} ${BUILD_WRKSRC}/${BUILD_PREFIX}/README.md ${STAGEDIR}${DATADIR} ${RM} ${STAGEDIR}${PREFIX}/LICENSE ${RM} ${STAGEDIR}${PREFIX}/README.md .include 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)std::tanh((double)x); + } + +- // Type trait that says BSNumber is a signed type. +- template +- struct is_signed> : 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,19 +1,22 @@ ---- 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) +set(THREADS_PREFER_PTHREAD_FLAG TRUE) +find_package(Threads REQUIRED) + 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 ) +