diff options
Diffstat (limited to 'cad')
32 files changed, 360 insertions, 110 deletions
diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 39bb86db8b56..f7064ce34ad2 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= openvsp -PORTVERSION= 2.3.0 -DISTVERSIONPREFIX= ${GH_PROJECT}_ -PORTREVISION= 4 +PORTVERSION= 3.5.2 +PORTREVISION= 0 CATEGORIES= cad +MASTER_SITES= GH MAINTAINER= fernando.apesteguia@gmail.com COMMENT= Create a 3D model of an aircraft defined by engineering parameters @@ -15,35 +15,55 @@ 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 -BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs LIB_DEPENDS= libpthread-stubs.so:devel/libpthread-stubs \ + libjpeg.so:graphics/jpeg-turbo \ libdrm.so:graphics/libdrm \ - libpng.so:graphics/png \ + libpng16.so:graphics/png \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ - libfltk.so:x11-toolkits/fltk + libfltk.so:x11-toolkits/fltk \ + libGLEW.so:graphics/glew \ + libcpptest.so:devel/cpptest +BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \ + ${LOCALBASE}/include/eli/code_eli.hpp:graphics/code-eli \ + ${LOCALBASE}/include/glm/glm.hpp:math/glm \ + ${LOCALBASE}/include/eigen3/Eigen/Array:math/eigen3 + +BROKEN_FreeBSD_9= dependency graphics/code-eli needs additional math functions +ONLY_FOR_ARCHS= amd64 USE_GITHUB= yes GH_PROJECT= OpenVSP GH_ACCOUNT= ${GH_PROJECT} +GH_TAGNAME= ${GH_PROJECT}_${PORTVERSION} + +WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}_${PORTVERSION} -CMAKE_SOURCE_PATH= ${WRKSRC}/src -USES= cmake:outsource dos2unix jpeg +CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject +USES= cmake:outsource compiler:gcc-c++11-lib +CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \ + -DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \ + -DVSP_USE_SYSTEM_LIBXML2:BOOLEAN=yes \ + -DVSP_USE_SYSTEM_EIGEN:BOOLEAN=yes \ + -DVSP_USE_SYSTEM_FLTK:boolean=yes \ + -DVSP_USE_SYSTEM_CMINPACK:boolean=no \ + -DVSP_USE_SYSTEM_GLM:BOOLEAN=yes \ + -DVSP_USE_SYSTEM_GLEW:BOOLEAN=yes USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \ xinerama xrender xxf86vm USE_GL= glu USE_GNOME= libxml2 CFLAGS+= -I${LOCALBASE}/include/openNURBS -PLIST_FILES= bin/vsp -PORTEXAMPLES= * - -OPTIONS_DEFINE= EXAMPLES +BUILD_PREFIX= OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-3.5.2-FreeBSD do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/vsp/vsp ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DATADIR} +.for d in CustomScripts airfoil matlab scripts textures + (cd ${BUILD_WRKSRC}/${BUILD_PREFIX}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) +.endfor + ${CP} ${BUILD_WRKSRC}/${BUILD_PREFIX}/LICENSE ${STAGEDIR}${DATADIR} .include <bsd.port.mk> diff --git a/cad/openvsp/distinfo b/cad/openvsp/distinfo index 97b03656806c..6de220f4da63 100644 --- a/cad/openvsp/distinfo +++ b/cad/openvsp/distinfo @@ -1,2 +1,2 @@ -SHA256 (OpenVSP-OpenVSP-OpenVSP_2.3.0_GH0.tar.gz) = e36d364fc4dd6bd3f994637fb67e1b2b2f06792620f151a61fbb75a6f4df8a2a -SIZE (OpenVSP-OpenVSP-OpenVSP_2.3.0_GH0.tar.gz) = 2940780 +SHA256 (OpenVSP-OpenVSP-3.5.2-OpenVSP_3.5.2_GH0.tar.gz) = 0267d53fa88d5a1fae888131682cd7383b861680a3ed079597ad5b059e169d0e +SIZE (OpenVSP-OpenVSP-3.5.2-OpenVSP_3.5.2_GH0.tar.gz) = 27883392 diff --git a/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake b/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake new file mode 100644 index 000000000000..92658ee88a3e --- /dev/null +++ b/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake @@ -0,0 +1,16 @@ +--- Libraries/cmake/External_CMinpack.cmake.orig 2016-02-14 00:01:30 UTC ++++ Libraries/cmake/External_CMinpack.cmake +@@ -1,3 +1,6 @@ ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lm -fPIC") ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -lm -fPIC") ++ + ExternalProject_Add( CMINPACK + URL ${CMAKE_CURRENT_SOURCE_DIR}/cminpack-1.3.3.tar.gz + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> +@@ -8,4 +11,4 @@ ExternalProject_Add( CMINPACK + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + ) + ExternalProject_Get_Property( CMINPACK BINARY_DIR INSTALL_DIR ) +-SET( CMINPACK_INSTALL_DIR ${INSTALL_DIR} ) +\ No newline at end of file ++SET( CMINPACK_INSTALL_DIR ${INSTALL_DIR} ) diff --git a/cad/openvsp/files/patch-Libraries_cmake_External__libIGES.cmake b/cad/openvsp/files/patch-Libraries_cmake_External__libIGES.cmake new file mode 100644 index 000000000000..35ea34d3bda4 --- /dev/null +++ b/cad/openvsp/files/patch-Libraries_cmake_External__libIGES.cmake @@ -0,0 +1,12 @@ +--- Libraries/cmake/External_libIGES.cmake.orig 2016-02-14 00:01:30 UTC ++++ Libraries/cmake/External_libIGES.cmake +@@ -1,6 +1,9 @@ + + # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libIGES/ + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++ + ExternalProject_Add( LIBIGES + URL ${CMAKE_CURRENT_SOURCE_DIR}/libIGES-03f6ee919151.zip + CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} diff --git a/cad/openvsp/files/patch-src_cfd__mesh_CMakeLists.txt b/cad/openvsp/files/patch-src_cfd__mesh_CMakeLists.txt new file mode 100644 index 000000000000..e035a309f2d2 --- /dev/null +++ b/cad/openvsp/files/patch-src_cfd__mesh_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/cfd_mesh/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/cfd_mesh/CMakeLists.txt +@@ -48,6 +48,8 @@ SurfPatch.h + Tri.h + ) + ++set_target_properties( cfd_mesh PROPERTIES COMPILE_FLAGS "-fPIC") ++ + ADD_DEPENDENCIES( cfd_mesh + util + ) diff --git a/cad/openvsp/files/patch-src_cmake_External__STEPCode.cmake b/cad/openvsp/files/patch-src_cmake_External__STEPCode.cmake new file mode 100644 index 000000000000..a4017028b4a4 --- /dev/null +++ b/cad/openvsp/files/patch-src_cmake_External__STEPCode.cmake @@ -0,0 +1,19 @@ +--- src/cmake/External_STEPCode.cmake.orig 2016-02-14 00:01:30 UTC ++++ src/cmake/External_STEPCode.cmake +@@ -8,6 +8,9 @@ ELSE() + SET( SC_SHARED ON ) + ENDIF() + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++ + ExternalProject_Add( STEPCODE + URL ${CMAKE_CURRENT_SOURCE_DIR}/stepcode-7dcd6ef3418a.zip + CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} +@@ -37,4 +40,4 @@ SET( STEPCODE_BINARY_DIR ${BINARY_DIR} ) + # Consequently, force Debug so it installs in ../sc-install directory + # instead of /usr/local/lib. + # +-# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF +\ No newline at end of file ++# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF diff --git a/cad/openvsp/files/patch-src_external_CMakeLists.txt b/cad/openvsp/files/patch-src_external_CMakeLists.txt new file mode 100644 index 000000000000..9274575dc3c7 --- /dev/null +++ b/cad/openvsp/files/patch-src_external_CMakeLists.txt @@ -0,0 +1,12 @@ +--- src/external/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/external/CMakeLists.txt +@@ -8,6 +8,9 @@ FIND_PACKAGE(CPPTest REQUIRED) + SET( CMAKE_PREFIX_PATH ${LIBXML2_INSTALL_DIR} ${ORIG_CMAKE_PREFIX_PATH} ) + FIND_PACKAGE(LibXml2 REQUIRED) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ++SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ++ + IF( NOT VSP_NO_GRAPHICS ) + SET( CMAKE_PREFIX_PATH ${FLTK_INSTALL_DIR} ${ORIG_CMAKE_PREFIX_PATH} ) + FIND_PACKAGE(FLTK REQUIRED) diff --git a/cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt b/cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt new file mode 100644 index 000000000000..6cc3de1af65f --- /dev/null +++ b/cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/external/angelscript/sdk/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/external/angelscript/sdk/CMakeLists.txt +@@ -127,6 +127,8 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINAR + find_package(Threads) + target_link_libraries(Angelscript ${CMAKE_THREAD_LIBS_INIT}) + ++set_target_properties( Angelscript PROPERTIES COMPILE_FLAGS "-fPIC") ++ + if(MSVC) + set_target_properties(Angelscript PROPERTIES COMPILE_FLAGS "/MP") + endif(MSVC) diff --git a/cad/openvsp/files/patch-src_external_glfont2_CMakeLists.txt b/cad/openvsp/files/patch-src_external_glfont2_CMakeLists.txt new file mode 100644 index 000000000000..62df9d7f88bc --- /dev/null +++ b/cad/openvsp/files/patch-src_external_glfont2_CMakeLists.txt @@ -0,0 +1,10 @@ +--- src/external/glfont2/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/external/glfont2/CMakeLists.txt +@@ -3,6 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + SET(GLFONT2_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to glfont2 headers") + + INCLUDE_DIRECTORIES( ${GLFONT2_INCLUDE_DIR} ++ /usr/local/include + ) + + ADD_LIBRARY( glfont2 diff --git a/cad/openvsp/files/patch-src_external_sixseries_CMakeLists.txt b/cad/openvsp/files/patch-src_external_sixseries_CMakeLists.txt new file mode 100644 index 000000000000..931a5c8d6600 --- /dev/null +++ b/cad/openvsp/files/patch-src_external_sixseries_CMakeLists.txt @@ -0,0 +1,8 @@ +--- src/external/sixseries/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/external/sixseries/CMakeLists.txt +@@ -10,3 +10,5 @@ s_copy.c + s_stop.c + f2c.h + ) ++ ++set_target_properties( sixseries PROPERTIES COMPILE_FLAGS "-fPIC") diff --git a/cad/openvsp/files/patch-src_external_triangle_CMakeLists.txt b/cad/openvsp/files/patch-src_external_triangle_CMakeLists.txt new file mode 100644 index 000000000000..6c7fefbb3a16 --- /dev/null +++ b/cad/openvsp/files/patch-src_external_triangle_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/external/triangle/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/external/triangle/CMakeLists.txt +@@ -9,6 +9,8 @@ triangle.c + triangle.h + ) + ++set_target_properties( triangle PROPERTIES COMPILE_FLAGS "-fPIC") ++ + # set MS Visual Compiler flags + IF(WIN32) + SET_TARGET_PROPERTIES( triangle PROPERTIES COMPILE_FLAGS "-fp:strict") diff --git a/cad/openvsp/files/patch-src_external_tritri_CMakeLists.txt b/cad/openvsp/files/patch-src_external_tritri_CMakeLists.txt new file mode 100644 index 000000000000..b98c657d51d1 --- /dev/null +++ b/cad/openvsp/files/patch-src_external_tritri_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/external/tritri/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/external/tritri/CMakeLists.txt +@@ -10,4 +10,6 @@ intersect_AABB.cpp + intersect_triangle.cpp + Tritri.cpp + Tritri.h +-) +\ No newline at end of file ++) ++ ++set_target_properties( tritri PROPERTIES COMPILE_FLAGS "-fPIC") diff --git a/cad/openvsp/files/patch-src_fltk__screens_CMakeLists.txt b/cad/openvsp/files/patch-src_fltk__screens_CMakeLists.txt new file mode 100644 index 000000000000..fed711a68e7b --- /dev/null +++ b/cad/openvsp/files/patch-src_fltk__screens_CMakeLists.txt @@ -0,0 +1,12 @@ +--- src/fltk_screens/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/fltk_screens/CMakeLists.txt +@@ -4,6 +4,9 @@ INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR} + + SET(SCREENS_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Path to FLTK generated *.h files") + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++ + FLTK_WRAP_UI( screens + aboutScreen.fl + awaveFlScreen.fl diff --git a/cad/openvsp/files/patch-src_geom__api_CMakeLists.txt b/cad/openvsp/files/patch-src_geom__api_CMakeLists.txt new file mode 100644 index 000000000000..7be8863ccf15 --- /dev/null +++ b/cad/openvsp/files/patch-src_geom__api_CMakeLists.txt @@ -0,0 +1,27 @@ +--- src/geom_api/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/geom_api/CMakeLists.txt +@@ -29,6 +29,8 @@ GuiInterface.h + VSP_Geom_API.h + ) + ++set_target_properties( geom_api PROPERTIES COMPILE_FLAGS "-fPIC") ++ + ADD_DEPENDENCIES( geom_api + util + ) +@@ -49,7 +51,7 @@ IF( NOT VSP_NO_GRAPHICS ) + util + ) + +- set_target_properties( geom_api_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1") ++set_target_properties( geom_api_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1 -fPIC") + + ADD_LIBRARY( gui_interface_g + GuiInterface.cpp +@@ -61,5 +63,5 @@ IF( NOT VSP_NO_GRAPHICS ) + util + ) + +- set_target_properties( gui_interface_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1") ++set_target_properties( gui_interface_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1 -fPIC") + ENDIF() diff --git a/cad/openvsp/files/patch-src_geom__core_CMakeLists.txt b/cad/openvsp/files/patch-src_geom__core_CMakeLists.txt new file mode 100644 index 000000000000..4318ec2318b2 --- /dev/null +++ b/cad/openvsp/files/patch-src_geom__core_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/geom_core/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/geom_core/CMakeLists.txt +@@ -116,6 +116,8 @@ XSecCurve.h + XSecSurf.h + ) + ++set_target_properties( geom_core PROPERTIES COMPILE_FLAGS "-fPIC") ++ + ADD_DEPENDENCIES( geom_core + util + ) diff --git a/cad/openvsp/files/patch-src_gui__and__draw_CMakeLists.txt b/cad/openvsp/files/patch-src_gui__and__draw_CMakeLists.txt new file mode 100644 index 000000000000..20005928afc1 --- /dev/null +++ b/cad/openvsp/files/patch-src_gui__and__draw_CMakeLists.txt @@ -0,0 +1,20 @@ +--- src/gui_and_draw/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/gui_and_draw/CMakeLists.txt +@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES( + ${STEPCODE_INCLUDE_DIR} + ${LIBIGES_INCLUDE_DIR} + ${GUI_AND_DRAW_INCLUDE_DIR} ++ /usr/local/include + ) + + ADD_LIBRARY(gui_and_draw +@@ -130,6 +131,9 @@ VSPWindow.h + WingScreen.h + ) + ++SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ++ + ADD_DEPENDENCIES(gui_and_draw + geom_core + vsp_graphic diff --git a/cad/openvsp/files/patch-src_gui__and__draw_GroupLayout.h b/cad/openvsp/files/patch-src_gui__and__draw_GroupLayout.h new file mode 100644 index 000000000000..b5c120acafc0 --- /dev/null +++ b/cad/openvsp/files/patch-src_gui__and__draw_GroupLayout.h @@ -0,0 +1,11 @@ +--- src/gui_and_draw/GroupLayout.h.orig 2016-02-14 00:01:30 UTC ++++ src/gui_and_draw/GroupLayout.h +@@ -17,7 +17,7 @@ + #include <FL/Fl_Text_Editor.H> + #include <FL/Fl_Radio_Button.H> + #include <FL/Fl_Color_Chooser.H> +-#include <FL/Fl_Sys_Menu_Bar.h> ++#include <FL/Fl_Sys_Menu_Bar.H> + + #include "GuiDevice.h" + diff --git a/cad/openvsp/files/patch-src_gui__and__draw_MainVSPScreen.h b/cad/openvsp/files/patch-src_gui__and__draw_MainVSPScreen.h new file mode 100644 index 000000000000..dad6a5dbca45 --- /dev/null +++ b/cad/openvsp/files/patch-src_gui__and__draw_MainVSPScreen.h @@ -0,0 +1,11 @@ +--- src/gui_and_draw/MainVSPScreen.h.orig 2016-02-14 00:01:30 UTC ++++ src/gui_and_draw/MainVSPScreen.h +@@ -15,7 +15,7 @@ + #include "MenuItem.h" + #include "ScreenBase.h" + #include "GuiDevice.h" +-#include "FL/Fl_Box.h" ++#include "FL/Fl_Box.H" + + namespace VSPGUI + { diff --git a/cad/openvsp/files/patch-src_gui__and__draw_MenuItem.h b/cad/openvsp/files/patch-src_gui__and__draw_MenuItem.h new file mode 100644 index 000000000000..8becfa57746d --- /dev/null +++ b/cad/openvsp/files/patch-src_gui__and__draw_MenuItem.h @@ -0,0 +1,11 @@ +--- src/gui_and_draw/MenuItem.h.orig 2016-02-14 00:01:30 UTC ++++ src/gui_and_draw/MenuItem.h +@@ -10,7 +10,7 @@ + #define MENUITEM__INCLUDED_ + + #include <string> +-#include <FL/Fl_Sys_Menu_Bar.h> ++#include <FL/Fl_Sys_Menu_Bar.H> + + class ScreenMgr; + class ActionScreen; 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..1638e5f6916d --- /dev/null +++ b/cad/openvsp/files/patch-src_util_CMakeLists.txt @@ -0,0 +1,8 @@ +--- src/util/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/util/CMakeLists.txt +@@ -63,3 +63,5 @@ XferSurf.h + ADD_DEPENDENCIES( util + STEPCODE + ) ++ ++set_target_properties( util PROPERTIES COMPILE_FLAGS "-fPIC") diff --git a/cad/openvsp/files/patch-src_util__code_array.h b/cad/openvsp/files/patch-src_util__code_array.h deleted file mode 100644 index 135ff61dd3c5..000000000000 --- a/cad/openvsp/files/patch-src_util__code_array.h +++ /dev/null @@ -1,25 +0,0 @@ -Workaround for libc++, which declares std::array even if not in C++11 mode (see -ports/207253 for a bigger discussion). ---- src/util_code/array.h.orig 2016-02-25 10:29:49 UTC -+++ src/util_code/array.h -@@ -20,11 +20,12 @@ - #include <iostream> - using namespace std; - -+namespace openvsp { -+ - // Define Error Flags // - #define BELOW_BOUNDS 0 - #define ABOVE_BOUNDS 1 - -- - template<class Item_type> - - class array -@@ -328,5 +331,6 @@ void array<Item_type>::print_error_messa - - } - -+} // namespace openvsp - - #endif diff --git a/cad/openvsp/files/patch-src_vsp__aero_CMakeLists.txt b/cad/openvsp/files/patch-src_vsp__aero_CMakeLists.txt new file mode 100644 index 000000000000..027ef33321e7 --- /dev/null +++ b/cad/openvsp/files/patch-src_vsp__aero_CMakeLists.txt @@ -0,0 +1,10 @@ +--- src/vsp_aero/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/vsp_aero/CMakeLists.txt +@@ -1,4 +1,7 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++ + ADD_SUBDIRECTORY( solver ) + ADD_SUBDIRECTORY( viewer ) diff --git a/cad/openvsp/files/patch-src_vsp__graphic_CMakeLists.txt b/cad/openvsp/files/patch-src_vsp__graphic_CMakeLists.txt new file mode 100644 index 000000000000..5c715446ca09 --- /dev/null +++ b/cad/openvsp/files/patch-src_vsp__graphic_CMakeLists.txt @@ -0,0 +1,12 @@ +--- src/vsp_graphic/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/vsp_graphic/CMakeLists.txt +@@ -4,6 +4,9 @@ SET(VSP_GRAPHIC_INCLUDE_DIR ${CMAKE_CURR + + set(GRAPHIC_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++ + FILE(GLOB_RECURSE GRAPHIC_HEADER ./include/*.h) + FILE(GLOB_RECURSE GRAPHIC_SOURCE ./src/*.cpp) + diff --git a/cad/openvsp/files/patch-src_vsp__graphic_src_Image.cpp b/cad/openvsp/files/patch-src_vsp__graphic_src_Image.cpp new file mode 100644 index 000000000000..571627159916 --- /dev/null +++ b/cad/openvsp/files/patch-src_vsp__graphic_src_Image.cpp @@ -0,0 +1,10 @@ +--- src/vsp_graphic/src/Image.cpp.orig 2016-02-14 00:01:30 UTC ++++ src/vsp_graphic/src/Image.cpp +@@ -1,6 +1,7 @@ + #include <assert.h> + #include <MultiImageLoader.h> + #include <algorithm> ++#include <stdlib.h> + + #include "Image.h" + diff --git a/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp b/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp new file mode 100644 index 000000000000..49c40f81bf3a --- /dev/null +++ b/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp @@ -0,0 +1,9 @@ +--- src/vsp_graphic/src/Shader.cpp.orig 2016-02-14 00:01:30 UTC ++++ src/vsp_graphic/src/Shader.cpp +@@ -1,5 +1,6 @@ + #include <assert.h> + #include <string> ++#include <stdlib.h> + + #include "Shader.h" + diff --git a/cad/openvsp/files/patch-src_vsp_af.cpp b/cad/openvsp/files/patch-src_vsp_af.cpp deleted file mode 100644 index e2df8a6fc1f3..000000000000 --- a/cad/openvsp/files/patch-src_vsp_af.cpp +++ /dev/null @@ -1,13 +0,0 @@ -Workaround for libc++, which declares std::array even if not in C++11 mode (see -ports/207253 for a bigger discussion). ---- src/vsp/af.cpp.orig 2016-02-25 10:34:17 UTC -+++ src/vsp/af.cpp -@@ -1744,7 +1744,7 @@ vec3d Af::get_rounded_end_cap(int index) - void Af::invert_airfoil() - { - int i; -- array <double> z; -+ openvsp::array <double> z; - z.init(num_pnts); - - //===== Switch Upper and Lower Z values ===== diff --git a/cad/openvsp/files/patch-src_vsp_havoc__geom.cpp b/cad/openvsp/files/patch-src_vsp_havoc__geom.cpp deleted file mode 100644 index 7d61a1a593fc..000000000000 --- a/cad/openvsp/files/patch-src_vsp_havoc__geom.cpp +++ /dev/null @@ -1,13 +0,0 @@ -Workaround for libc++, which declares std::array even if not in C++11 mode (see -ports/207253 for a bigger discussion). ---- src/vsp/havoc_geom.cpp.orig 2016-02-25 10:35:42 UTC -+++ src/vsp/havoc_geom.cpp -@@ -428,7 +428,7 @@ void Havoc_geom::generate_planform_curve - - //==== Find Xsec Locations ====// - int num_xsecs = havoc_num_xsecs - 3; -- array< double > tmp_x; -+ openvsp::array< double > tmp_x; - tmp_x.init ( num_xsecs ); - - for ( i = 0 ; i < num_xsecs ; i++ ) diff --git a/cad/openvsp/files/patch-src_vsp_havoc__geom.h b/cad/openvsp/files/patch-src_vsp_havoc__geom.h deleted file mode 100644 index 1baf616a1936..000000000000 --- a/cad/openvsp/files/patch-src_vsp_havoc__geom.h +++ /dev/null @@ -1,21 +0,0 @@ -Workaround for libc++, which declares std::array even if not in C++11 mode (see -ports/207253 for a bigger discussion). ---- src/vsp/havoc_geom.h.orig 2016-02-25 10:33:52 UTC -+++ src/vsp/havoc_geom.h -@@ -88,11 +88,11 @@ class Havoc_geom : public Geom - int havoc_num_xsecs; - int havoc_num_pnts; - -- array< double > x_locs; -- array< double > left; -- array< double > right; -- array< double > upper; -- array< double > lower; -+ openvsp::array< double > x_locs; -+ openvsp::array< double > left; -+ openvsp::array< double > right; -+ openvsp::array< double > upper; -+ openvsp::array< double > lower; - - Parm length; - diff --git a/cad/openvsp/files/patch-src_xmlvsp_CMakeLists.txt b/cad/openvsp/files/patch-src_xmlvsp_CMakeLists.txt new file mode 100644 index 000000000000..97f4aa24502d --- /dev/null +++ b/cad/openvsp/files/patch-src_xmlvsp_CMakeLists.txt @@ -0,0 +1,9 @@ +--- src/xmlvsp/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC ++++ src/xmlvsp/CMakeLists.txt +@@ -14,3 +14,6 @@ XmlUtil.h + XmlUtil.cpp + + ) ++ ++set_target_properties( xmlvsp PROPERTIES COMPILE_FLAGS "-fPIC") ++ diff --git a/cad/openvsp/files/patch-vsp-CMakeLists.txt b/cad/openvsp/files/patch-vsp-CMakeLists.txt deleted file mode 100644 index fcd38f6a195b..000000000000 --- a/cad/openvsp/files/patch-vsp-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- src/vsp/CMakeLists.txt.orig 2014-08-08 15:23:12.000000000 +0200 -+++ src/vsp/CMakeLists.txt 2014-08-08 15:23:59.000000000 +0200 -@@ -216,6 +216,7 @@ - ${FLTK_LIBRARIES} - ${OPENGL_LIBRARIES} - ${OPENNURBS_LIBRARIES} -+ -pthread - ) - - INSTALL( TARGETS vsp RUNTIME DESTINATION . ) diff --git a/cad/openvsp/files/patch-xmlvsp-CMakeLists.txt b/cad/openvsp/files/patch-xmlvsp-CMakeLists.txt deleted file mode 100644 index 2f034aff4294..000000000000 --- a/cad/openvsp/files/patch-xmlvsp-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- /home/fernape/porting/openvsp/original/OpenVSP_2.0_community_src/src/xmlvsp/CMakeLists.txt 2012-04-04 21:03:54.000000000 +0200 -+++ src/xmlvsp/CMakeLists.txt 2012-04-04 20:29:08.000000000 +0200 -@@ -2,7 +2,7 @@ - - FIND_PACKAGE(LibXml2 REQUIRED) - --INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR}) -+INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} /usr/local/include) - - SET(XMLVSP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to XML wrapper header.") - diff --git a/cad/openvsp/pkg-plist b/cad/openvsp/pkg-plist new file mode 100644 index 000000000000..31b0af0655d9 --- /dev/null +++ b/cad/openvsp/pkg-plist @@ -0,0 +1,41 @@ +bin/vsp +bin/vspaero +bin/vspscript +bin/vspviewer +%%DATADIR%%/23015.af +%%DATADIR%%/Box.vsppart +%%DATADIR%%/BoxGroup.vsppart +%%DATADIR%%/CFDMesh.vspscript +%%DATADIR%%/Cone.vsppart +%%DATADIR%%/CreateEditGeom.vspscript +%%DATADIR%%/DegenGeom.vspscript +%%DATADIR%%/Disk.vsppart +%%DATADIR%%/Duct.vsppart +%%DATADIR%%/Fuselage.vspscript +%%DATADIR%%/LICENSE +%%DATADIR%%/N0012_VSP.af +%%DATADIR%%/N0012_VSP_sym.af +%%DATADIR%%/OnOffExample.vsppart +%%DATADIR%%/PodMan.vsppart +%%DATADIR%%/Seat.vsppart +%%DATADIR%%/SeatGroup.vsppart +%%DATADIR%%/SharkTeeth.tga +%%DATADIR%%/Stack.vspscript +%%DATADIR%%/SubSurface.vspscript +%%DATADIR%%/TestAll.vspscript +%%DATADIR%%/TransportFuse.vsppart +%%DATADIR%%/Wing.vspscript +%%DATADIR%%/b737a.af +%%DATADIR%%/b737b.af +%%DATADIR%%/b737c.af +%%DATADIR%%/b737d.af +%%DATADIR%%/clarky_Lednicer.dat +%%DATADIR%%/e205_Selig.dat +%%DATADIR%%/n0012.dat +%%DATADIR%%/nasa-logo.tga +%%DATADIR%%/plotDegenPlate.m +%%DATADIR%%/plotDegenStick.m +%%DATADIR%%/plotDegenSurf.m +%%DATADIR%%/redbluearrow.tga +%%DATADIR%%/sc2_0404.af +%%DATADIR%%/window.tga |