Skip to content

Commit

Permalink
cad/openvsp: update to 3.37.2
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Fernando Apesteguía authored and Fernando Apesteguía committed Mar 26, 2024
1 parent 4dfe986 commit fb8a498
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 204 deletions.
13 changes: 10 additions & 3 deletions 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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions 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

This file was deleted.

This file was deleted.

This file was deleted.

10 changes: 10 additions & 0 deletions 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>
19 changes: 19 additions & 0 deletions 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)
10 changes: 0 additions & 10 deletions cad/openvsp/files/patch-src_util_FileUtil.cpp

This file was deleted.

3 changes: 0 additions & 3 deletions cad/openvsp/pkg-plist
Expand Up @@ -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
Expand Down

0 comments on commit fb8a498

Please sign in to comment.