diff options
Diffstat (limited to 'math/openmesh/files')
12 files changed, 177 insertions, 0 deletions
diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc new file mode 100644 index 000000000000..b3b792da4206 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/Decimating/decimater.cc.orig 2018-10-21 23:36:03 UTC ++++ src/OpenMesh/Apps/Decimating/decimater.cc +@@ -58,6 +58,9 @@ + #include <string> + #include <memory> + #include <map> ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + //-------------------- + #include <OpenMesh/Core/IO/MeshIO.hh> + //-------------------- diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc new file mode 100644 index 000000000000..0dffab8c0e5d --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/Decimating/decimaterviewer.cc.orig 2018-10-21 23:51:30 UTC ++++ src/OpenMesh/Apps/Decimating/decimaterviewer.cc +@@ -63,6 +63,9 @@ + #else + #include <GL/glut.h> + #endif ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + + void usage_and_exit(int xcode); + diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc new file mode 100644 index 000000000000..9966d866c5d1 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/QtViewer/meshviewer.cc.orig 2018-10-21 23:50:54 UTC ++++ src/OpenMesh/Apps/QtViewer/meshviewer.cc +@@ -63,6 +63,9 @@ + #else + #include <GL/glut.h> + #endif ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + + #include "MeshViewerWidget.hh" + diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc new file mode 100644 index 000000000000..b0c37cad7eb9 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/Smoothing/smooth.cc.orig 2018-10-21 23:39:56 UTC ++++ src/OpenMesh/Apps/Smoothing/smooth.cc +@@ -53,6 +53,9 @@ + #include <OpenMesh/Tools/Utils/Timer.hh> + #include <OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh> + #include <OpenMesh/Tools/Utils/getopt.h> ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + + + using namespace OpenMesh; diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc new file mode 100644 index 000000000000..3185865f8633 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc.orig 2018-10-21 23:38:04 UTC ++++ src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc +@@ -67,6 +67,9 @@ + # include <cmath> + using std::pow; + #endif ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + + + using OpenMesh::Subdivider::Adaptive::CompositeTraits; diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc new file mode 100644 index 000000000000..74cab1bff5b6 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/Subdivider/subdivider.cc.orig 2018-10-21 23:37:26 UTC ++++ src/OpenMesh/Apps/Subdivider/subdivider.cc +@@ -48,6 +48,9 @@ + + #include <iostream> + #include <sstream> ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + // ---------------------------------------- OpenMesh Stuff + #include <OpenMesh/Core/IO/MeshIO.hh> + #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh> diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc new file mode 100644 index 000000000000..30c6c98c49b9 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc.orig 2018-10-21 23:40:29 UTC ++++ src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc +@@ -56,6 +56,9 @@ + #include <limits> + #include <exception> + #include <cmath> ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + // -------------------- OpenMesh + #include <OpenMesh/Core/IO/MeshIO.hh> + #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh> diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc new file mode 100644 index 000000000000..209d5dbc3bf6 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc.orig 2018-10-21 23:38:43 UTC ++++ src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc +@@ -50,6 +50,9 @@ + #include <iostream> + #include <sstream> + #include <cmath> ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + // -------------------- OpenMesh + #include <OpenMesh/Core/IO/MeshIO.hh> + #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh> diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc new file mode 100644 index 000000000000..a50635faf650 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/mconvert/mconvert.cc.orig 2018-10-21 23:39:10 UTC ++++ src/OpenMesh/Apps/mconvert/mconvert.cc +@@ -50,6 +50,9 @@ + #include <iterator> + #include <fstream> + #include <string> ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + // + #include <OpenMesh/Core/IO/MeshIO.hh> + #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh> diff --git a/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt b/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt new file mode 100644 index 000000000000..28c56e9f1459 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/OpenMesh/Core/CMakeLists.txt.orig 2018-10-22 04:57:49 UTC ++++ src/OpenMesh/Core/CMakeLists.txt +@@ -45,7 +45,7 @@ if (WIN32) + endif() + + else () +- acg_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers}) ++ acg_add_library (OpenMeshCore SHARED ${sources} ${headers}) + set_target_properties (OpenMeshCore PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} + SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} ) + diff --git a/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt b/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt new file mode 100644 index 000000000000..b62da8286538 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt @@ -0,0 +1,29 @@ +--- src/OpenMesh/Tools/CMakeLists.txt.orig 2017-01-08 22:09:58 UTC ++++ src/OpenMesh/Tools/CMakeLists.txt +@@ -46,7 +46,7 @@ if (WIN32) + endif() + + else () +- acg_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers}) ++ acg_add_library (OpenMeshTools SHARED ${sources} ${headers}) + set_target_properties (OpenMeshTools PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} + SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} ) + endif () +@@ -54,7 +54,7 @@ endif () + target_link_libraries (OpenMeshTools OpenMeshCore) + + IF( NOT WIN32 ) +- target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic) ++ #target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic) + ENDIF(NOT WIN32) + + if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS ) +@@ -70,7 +70,7 @@ if ( (${PROJECT_NAME} MATCHES "OpenMesh" + if (APPLE) + # let bundle generation depend on target + add_dependencies (fixbundle OpenMeshTools) +- add_dependencies (fixbundle OpenMeshToolsStatic) ++ #add_dependencies (fixbundle OpenMeshToolsStatic) + endif() + + endif() diff --git a/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc b/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc new file mode 100644 index 000000000000..43c04d823316 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc @@ -0,0 +1,29 @@ +--- src/OpenMesh/Tools/Utils/Timer.cc.orig 2018-10-21 23:42:34 UTC ++++ src/OpenMesh/Tools/Utils/Timer.cc +@@ -46,6 +46,8 @@ + * * + \*===========================================================================*/ + ++#include <sys/time.h> ++ + #ifndef DOXY_IGNORE_THIS + // ---------------------------------------------------------------------------- + #include <OpenMesh/Core/System/config.h> +@@ -188,7 +190,7 @@ protected: + }; + + // ----------------------------------------------------------- gettimeofday ---- +-#elif (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__) ++#elif 0 && (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__) + + # include <sys/time.h> + # include <sys/resource.h> +@@ -276,7 +278,7 @@ Timer::Timer(void) : + # else + impl_ = new TimerImplPosix<CLOCK_REALTIME>; + # endif +-#elif (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32)) ) && !defined(__MINGW32__) ++#elif 0 && (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32)) ) && !defined(__MINGW32__) + impl_ = new TimerImplGToD; + #else + impl_ = new TimerImplStd; |