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..4a874729818c --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/Decimating/decimater.cc.orig 2020-03-12 13:55:53 UTC ++++ src/OpenMesh/Apps/Decimating/decimater.cc +@@ -53,6 +53,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..7870d8bf725a --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/Decimating/decimaterviewer.cc.orig 2020-03-12 13:55:53 UTC ++++ src/OpenMesh/Apps/Decimating/decimaterviewer.cc +@@ -44,6 +44,9 @@ + #ifdef _MSC_VER + # pragma warning(disable: 4267 4311) + #endif ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + + #include <iostream> + #include <fstream> 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..63c08e4bd104 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/QtViewer/meshviewer.cc.orig 2020-03-12 13:55:53 UTC ++++ src/OpenMesh/Apps/QtViewer/meshviewer.cc +@@ -42,6 +42,9 @@ + #ifdef _MSC_VER + # pragma warning(disable: 4267 4311) + #endif ++#if defined(__FreeBSD__) ++#include <unistd.h> ++#endif + + #include <iostream> + #include <fstream> 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..cd8a76ebfddf --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/Smoothing/smooth.cc.orig 2020-03-12 13:55:53 UTC ++++ src/OpenMesh/Apps/Smoothing/smooth.cc +@@ -48,6 +48,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..c9306817d55b --- /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 2020-03-12 13:55:53 UTC ++++ src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc +@@ -62,6 +62,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..3255dd05ece1 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/Subdivider/subdivider.cc.orig 2020-03-12 13:55:53 UTC ++++ src/OpenMesh/Apps/Subdivider/subdivider.cc +@@ -43,6 +43,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..f18104d80f1a --- /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 2020-03-12 13:55:54 UTC ++++ src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc +@@ -51,6 +51,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..b6e24595e29b --- /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 2020-03-12 13:55:54 UTC ++++ src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc +@@ -45,6 +45,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..22ea215e9c96 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc @@ -0,0 +1,12 @@ +--- src/OpenMesh/Apps/mconvert/mconvert.cc.orig 2020-03-12 13:55:54 UTC ++++ src/OpenMesh/Apps/mconvert/mconvert.cc +@@ -45,6 +45,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..4039b7c53a3c --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/OpenMesh/Core/CMakeLists.txt.orig 2020-03-12 13:55:54 UTC ++++ src/OpenMesh/Core/CMakeLists.txt +@@ -41,7 +41,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..c4584a5a0a98 --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt @@ -0,0 +1,29 @@ +--- src/OpenMesh/Tools/CMakeLists.txt.orig 2021-03-25 00:45:18 UTC ++++ src/OpenMesh/Tools/CMakeLists.txt +@@ -43,7 +43,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 () +@@ -51,7 +51,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 ) +@@ -67,7 +67,7 @@ if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_AP + 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..07453764c7ed --- /dev/null +++ b/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc @@ -0,0 +1,29 @@ +--- src/OpenMesh/Tools/Utils/Timer.cc.orig 2020-03-12 13:55:54 UTC ++++ src/OpenMesh/Tools/Utils/Timer.cc +@@ -41,6 +41,8 @@ + + + ++#include <sys/time.h> ++ + #ifndef DOXY_IGNORE_THIS + // ---------------------------------------------------------------------------- + #include <OpenMesh/Core/System/config.h> +@@ -145,7 +147,7 @@ double TimerImplWin32::seconds(void) const + } + + // ------------------------------------------------------------- posix time ---- +-#elif defined(__GNUC__) && defined(__POSIX__) ++#elif 0 && defined(__GNUC__) && defined(__POSIX__) + + #ifndef DOXY_IGNORE_THIS + # include <time.h> +@@ -183,7 +185,7 @@ class TimerImplPosix : public TimerImpl (protected) + }; + + // ----------------------------------------------------------- gettimeofday ---- +-#elif (defined(__GNUC__) && !defined(__FreeBSD__) || (defined(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__) ++#elif 0 && (defined(__GNUC__) && !defined(__FreeBSD__) || (defined(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__) + + # include <sys/time.h> + # include <sys/resource.h> |