git: fb8a498ae4a8 - main - cad/openvsp: update to 3.37.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 26 Mar 2024 18:38:23 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fb8a498ae4a8c688a611482ef539b7a6f8f1d0f4
commit fb8a498ae4a8c688a611482ef539b7a6f8f1d0f4
Author: Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2024-03-11 07:53:35 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2024-03-26 18:36:30 +0000
cad/openvsp: update to 3.37.2
https://github.com/OpenVSP/OpenVSP/releases/tag/OpenVSP_3.37.2
3.37.1:
This version changes a compiler flag that makes a new dependency build properly
on Windows. This in turn fixes CFDMesh and FEAMesh on Windows. Without this
change, 3.37.0 will quickly crash if you try to use either mesher. This won’t
change anything for non-windows users.
3.37.2 contains bugfixes
For now, use bundled fltk since the port uses a newer version than the one in
ports.
---
cad/openvsp/Makefile | 13 +-
cad/openvsp/distinfo | 6 +-
...tch-src_external_angelscript_sdk_CMakeLists.txt | 10 --
...pt_sdk_angelscript_source_as__callfunc__x86.cpp | 164 ---------------------
...angelscript_sdk_angelscript_source_as__config.h | 11 --
.../files/patch-src_gui__and__draw_ScreenBase.h | 10 ++
cad/openvsp/files/patch-src_util_CMakeLists.txt | 19 +++
cad/openvsp/files/patch-src_util_FileUtil.cpp | 10 --
cad/openvsp/pkg-plist | 3 -
9 files changed, 42 insertions(+), 204 deletions(-)
diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile
index ae85210f0e5b..49bffcc6857d 100644
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@@ -1,6 +1,6 @@
PORTNAME= openvsp
DISTVERSIONPREFIX= ${GH_PROJECT}_
-DISTVERSION= 3.37.0
+DISTVERSION= 3.37.2
CATEGORIES= cad
MAINTAINER= fernape@FreeBSD.org
@@ -24,8 +24,9 @@ LIB_DEPENDS= libdrm.so:graphics/libdrm \
libfltk.so:x11-toolkits/fltk \
libcpptest.so:devel/cpptest
-USES= cmake:noninja localbase\
+USES= cmake:noninja localbase \
gl gnome jpeg xorg
+
.if !exists(/usr/include/omp.h)
CXXFLAGS+= -fpermissive
USES+= compiler:gcc-c++11-lib
@@ -35,6 +36,7 @@ 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
@@ -46,7 +48,8 @@ CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK: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=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
@@ -57,6 +60,10 @@ BUILD_PREFIX= OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenV
CXXFLAGS_powerpc64= -mvsx
+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}
diff --git a/cad/openvsp/distinfo b/cad/openvsp/distinfo
index b837187bb18e..e97c034c5735 100644
--- a/cad/openvsp/distinfo
+++ b/cad/openvsp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709624037
-SHA256 (OpenVSP-OpenVSP-OpenVSP_3.37.0_GH0.tar.gz) = b683a62fd631bc23210cba86d35ee3809f3cf2824fcaafd4054352418b9a5380
-SIZE (OpenVSP-OpenVSP-OpenVSP_3.37.0_GH0.tar.gz) = 125331862
+TIMESTAMP = 1711199486
+SHA256 (OpenVSP-OpenVSP-OpenVSP_3.37.2_GH0.tar.gz) = f7457d8e2da6c517bc977b1478f864e1f0497ed11db9f1ab47c5237cb22fb538
+SIZE (OpenVSP-OpenVSP-OpenVSP_3.37.2_GH0.tar.gz) = 124927637
diff --git a/cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt b/cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt
deleted file mode 100644
index 5c56f96b545a..000000000000
--- a/cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/external/angelscript/sdk/CMakeLists.txt.orig 2021-08-10 01:31:47 UTC
-+++ src/external/angelscript/sdk/CMakeLists.txt
-@@ -125,7 +125,6 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
- enable_language(ASM)
- if(CMAKE_ASM_COMPILER_WORKS)
- set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ./angelscript/source/as_callfunc_arm.cpp ./angelscript/source/as_callfunc_arm_gcc.S)
-- set_property(SOURCE ./angelscript/source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
- else()
- message(FATAL ERROR "ARM target requires a working assembler")
- endif()
diff --git a/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp b/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp
deleted file mode 100644
index eb0ddb0e75f7..000000000000
--- a/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
---- src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp.orig 2021-08-10 01:31:47 UTC
-+++ src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp
-@@ -340,7 +340,7 @@ endcopy:
- volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
- asm __volatile__(
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // When compiled with optimizations the stack unwind doesn't work properly,
- // causing exceptions to crash the application. By adding this prologue
- // and the epilogue below, the stack unwind works as it should.
-@@ -385,7 +385,7 @@ endcopy:
- // Pop the alignment bytes
- "popl %%esp \n"
- "popl %%ebx \n"
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // Epilogue
- "movl %%ebp, %%esp \n"
- ".cfi_def_cfa_register esp \n"
-@@ -462,7 +462,7 @@ endcopy:
- volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
- asm __volatile__ (
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // When compiled with optimizations the stack unwind doesn't work properly,
- // causing exceptions to crash the application. By adding this prologue
- // and the epilogue below, the stack unwind works as it should.
-@@ -508,7 +508,7 @@ endcopy:
- // Pop the alignment bytes
- "popl %%esp \n"
- "popl %%ebx \n"
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // Epilogue
- "movl %%ebp, %%esp \n"
- ".cfi_def_cfa_register esp \n"
-@@ -585,7 +585,7 @@ endcopy:
- volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
- asm __volatile__ (
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // When compiled with optimizations the stack unwind doesn't work properly,
- // causing exceptions to crash the application. By adding this prologue
- // and the epilogue below, the stack unwind works as it should.
-@@ -631,7 +631,7 @@ endcopy:
- // Pop the alignment bytes
- "popl %%esp \n"
- "popl %%ebx \n"
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // Epilogue
- "movl %%ebp, %%esp \n"
- ".cfi_def_cfa_register esp \n"
-@@ -717,7 +717,7 @@ endcopy:
- volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
-
- asm __volatile__ (
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // When compiled with optimizations the stack unwind doesn't work properly,
- // causing exceptions to crash the application. By adding this prologue
- // and the epilogue below, the stack unwind works as it should.
-@@ -767,7 +767,7 @@ endcopy:
- // Pop the alignment bytes
- "popl %%esp \n"
- "popl %%ebx \n"
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // Epilogue
- "movl %%ebp, %%esp \n"
- ".cfi_def_cfa_register esp \n"
-@@ -849,7 +849,7 @@ endcopy:
- volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
-
- asm __volatile__ (
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // When compiled with optimizations the stack unwind doesn't work properly,
- // causing exceptions to crash the application. By adding this prologue
- // and the epilogue below, the stack unwind works as it should.
-@@ -896,7 +896,7 @@ endcopy:
- // Pop the alignment bytes
- "popl %%esp \n"
- "popl %%ebx \n"
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // Epilogue
- "movl %%ebp, %%esp \n"
- ".cfi_def_cfa_register esp \n"
-@@ -980,7 +980,7 @@ endcopy:
- volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
-
- asm __volatile__ (
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // When compiled with optimizations the stack unwind doesn't work properly,
- // causing exceptions to crash the application. By adding this prologue
- // and the epilogue below, the stack unwind works as it should.
-@@ -1030,7 +1030,7 @@ endcopy:
- // Pop the alignment bytes
- "popl %%esp \n"
- "popl %%ebx \n"
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // Epilogue
- "movl %%ebp, %%esp \n"
- ".cfi_def_cfa_register esp \n"
-@@ -1102,7 +1102,7 @@ endcopy:
- volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
- asm __volatile__ (
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // When compiled with optimizations the stack unwind doesn't work properly,
- // causing exceptions to crash the application. By adding this prologue
- // and the epilogue below, the stack unwind works as it should.
-@@ -1145,7 +1145,7 @@ endcopy:
- // Pop the alignment bytes
- "popl %%esp \n"
- "popl %%ebx \n"
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // Epilogue
- "movl %%ebp, %%esp \n"
- ".cfi_def_cfa_register esp \n"
-@@ -1233,7 +1233,7 @@ endcopy:
- volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
- asm __volatile__ (
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // When compiled with optimizations the stack unwind doesn't work properly,
- // causing exceptions to crash the application. By adding this prologue
- // and the epilogue below, the stack unwind works as it should.
-@@ -1285,7 +1285,7 @@ endcopy:
- // Pop the alignment bytes
- "popl %%esp \n"
- "popl %%ebx \n"
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // Epilogue
- "movl %%ebp, %%esp \n"
- ".cfi_def_cfa_register esp \n"
-@@ -1380,7 +1380,7 @@ endcopy:
- volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
-
- asm __volatile__ (
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // When compiled with optimizations the stack unwind doesn't work properly,
- // causing exceptions to crash the application. By adding this prologue
- // and the epilogue below, the stack unwind works as it should.
-@@ -1445,7 +1445,7 @@ endcopy:
- // Pop the alignment bytes
- "popl %%esp \n"
- "popl %%ebx \n"
--#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && !defined(__clang__)
- // Epilogue
- "movl %%ebp, %%esp \n"
- ".cfi_def_cfa_register esp \n"
diff --git a/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__config.h b/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__config.h
deleted file mode 100644
index 54a2d000dcd1..000000000000
--- a/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/external/angelscript/sdk/angelscript/source/as_config.h.orig 2021-08-10 01:31:47 UTC
-+++ src/external/angelscript/sdk/angelscript/source/as_config.h
-@@ -1008,7 +1008,7 @@
- // Free BSD
- #elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
- #define AS_BSD
-- #if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
-+ #if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__amd64__)
- #undef COMPLEX_MASK
- #define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
- #undef COMPLEX_RETURN_MASK
diff --git a/cad/openvsp/files/patch-src_gui__and__draw_ScreenBase.h b/cad/openvsp/files/patch-src_gui__and__draw_ScreenBase.h
new file mode 100644
index 000000000000..35bee5ca698e
--- /dev/null
+++ b/cad/openvsp/files/patch-src_gui__and__draw_ScreenBase.h
@@ -0,0 +1,10 @@
+--- src/gui_and_draw/ScreenBase.h.orig 2024-03-26 08:35:31 UTC
++++ src/gui_and_draw/ScreenBase.h
+@@ -11,6 +11,7 @@
+ #if !defined(SCREENBASE__INCLUDED_)
+ #define SCREENBASE__INCLUDED_
+
++#undef nitems
+ #include <FL/Fl.H>
+ #include <FL/Fl_Browser.H>
+ #include <FL/Fl_Check_Browser.H>
diff --git a/cad/openvsp/files/patch-src_util_CMakeLists.txt b/cad/openvsp/files/patch-src_util_CMakeLists.txt
new file mode 100644
index 000000000000..663e0b29e8cc
--- /dev/null
+++ b/cad/openvsp/files/patch-src_util_CMakeLists.txt
@@ -0,0 +1,19 @@
+--- src/util/CMakeLists.txt.orig 2024-03-22 17:20:53 UTC
++++ src/util/CMakeLists.txt
+@@ -21,6 +21,10 @@ INCLUDE_DIRECTORIES(
+ ${PCGCPP_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
+ WriteMatlab.h
+ XferSurf.h
+ )
++
++target_link_libraries(util Threads::Threads)
diff --git a/cad/openvsp/files/patch-src_util_FileUtil.cpp b/cad/openvsp/files/patch-src_util_FileUtil.cpp
deleted file mode 100644
index f015f0d67a1d..000000000000
--- a/cad/openvsp/files/patch-src_util_FileUtil.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/util/FileUtil.cpp.orig 2019-11-25 15:26:25 UTC
-+++ src/util/FileUtil.cpp
-@@ -21,6 +21,7 @@
-
- #ifdef __FreeBSD__
- #include <libgen.h>
-+#include <sys/param.h>
- #endif
-
- vector< string > ScanFolder( const char* dir_path )
diff --git a/cad/openvsp/pkg-plist b/cad/openvsp/pkg-plist
index d3b993816b0a..a55df486437a 100644
--- a/cad/openvsp/pkg-plist
+++ b/cad/openvsp/pkg-plist
@@ -7,9 +7,6 @@ bin/vspaero_opt
bin/vsploads
bin/vspscript
bin/vspviewer
-python/openvsp/openvsp/vspaero
-python/openvsp/openvsp/vsploads
-python/openvsp/openvsp/vspviewer
%%DATADIR%%/23015.af
%%DATADIR%%/AirfoilExport.vspscript
%%DATADIR%%/BezierAirfoilExample.m