cad/openvsp: update 3.5.2 -> 3.6.0

Changes:	http://openvsp.org/blogs/announcements/2016/05/06/openvsp-3-6-0-released

PR:		209436
Submitted by:	fernando.apesteguia@gmail.com
This commit is contained in:
Jason Unovitch 2016-05-12 14:07:23 +00:00
parent b7b8a5cfb4
commit 249938aafe
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=415065
26 changed files with 6 additions and 280 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= openvsp
PORTVERSION= 3.5.2
PORTVERSION= 3.6.0
DISTVERSIONPREFIX= ${GH_PROJECT}_
PORTREVISION= 0
CATEGORIES= cad
@ -55,7 +55,7 @@ USE_GL= glu
USE_GNOME= libxml2
CFLAGS+= -I${LOCALBASE}/include/openNURBS
BUILD_PREFIX= OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-3.5.2-FreeBSD
BUILD_PREFIX= OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-${PORTVERSION}-FreeBSD
do-install:
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin

View file

@ -1,2 +1,2 @@
SHA256 (OpenVSP-OpenVSP-OpenVSP_3.5.2_GH0.tar.gz) = 0267d53fa88d5a1fae888131682cd7383b861680a3ed079597ad5b059e169d0e
SIZE (OpenVSP-OpenVSP-OpenVSP_3.5.2_GH0.tar.gz) = 27883392
SHA256 (OpenVSP-OpenVSP-OpenVSP_3.6.0_GH0.tar.gz) = c2439d5bb4600011d9230531ec2f5c798e869ee607c502ca53784a85295d2256
SIZE (OpenVSP-OpenVSP-OpenVSP_3.6.0_GH0.tar.gz) = 28793759

View file

@ -1,12 +0,0 @@
--- 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}

View file

@ -1,11 +0,0 @@
--- 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
)

View file

@ -1,19 +0,0 @@
--- 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

View file

@ -1,12 +0,0 @@
--- 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)

View file

@ -1,11 +0,0 @@
--- 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)

View file

@ -1,10 +0,0 @@
--- 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

View file

@ -1,8 +0,0 @@
--- 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")

View file

@ -1,11 +0,0 @@
--- 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")

View file

@ -1,11 +0,0 @@
--- 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")

View file

@ -1,12 +0,0 @@
--- 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

View file

@ -1,27 +0,0 @@
--- 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()

View file

@ -1,11 +0,0 @@
--- 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
)

View file

@ -1,20 +0,0 @@
--- 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

View file

@ -1,11 +0,0 @@
--- 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"

View file

@ -1,11 +0,0 @@
--- 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
{

View file

@ -1,11 +0,0 @@
--- 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;

View file

@ -1,8 +0,0 @@
--- 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")

View file

@ -1,10 +0,0 @@
--- 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 )

View file

@ -1,12 +0,0 @@
--- 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)

View file

@ -1,10 +0,0 @@
--- 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"

View file

@ -1,10 +0,0 @@
--- src/vsp_graphic/src/Scene.cpp.orig 2016-04-22 13:35:09 UTC
+++ src/vsp_graphic/src/Scene.cpp
@@ -16,6 +16,7 @@
#include "ByteOperationUtil.h"
#include <assert.h>
+#include <stdlib.h>
namespace VSPGraphic
{

View file

@ -1,9 +0,0 @@
--- 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"

View file

@ -1,9 +0,0 @@
--- 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")
+

View file

@ -20,9 +20,11 @@ bin/vspviewer
%%DATADIR%%/Seat.vsppart
%%DATADIR%%/SeatGroup.vsppart
%%DATADIR%%/SharkTeeth.tga
%%DATADIR%%/SnapToDemo.vspscript
%%DATADIR%%/Stack.vspscript
%%DATADIR%%/SubSurface.vspscript
%%DATADIR%%/TestAll.vspscript
%%DATADIR%%/TestAnalysis.vspscript
%%DATADIR%%/TransportFuse.vsppart
%%DATADIR%%/Wing.vspscript
%%DATADIR%%/b737a.af