Date: Thu, 25 Mar 2021 01:00:30 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569173 - in head: . math math/openmesh math/openmesh/files Message-ID: <202103250100.12P10UIt028248@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Thu Mar 25 01:00:29 2021 New Revision: 569173 URL: https://svnweb.freebsd.org/changeset/ports/569173 Log: Re-add port: math/openmesh: Update 8.0 -> 8.1 Added: head/math/openmesh/ - copied from r546332, head/math/openmesh/ Modified: head/MOVED head/math/Makefile head/math/openmesh/Makefile head/math/openmesh/distinfo head/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc head/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc head/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc head/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc head/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc head/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc head/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc head/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc head/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc head/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt head/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt head/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc head/math/openmesh/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Thu Mar 25 00:58:09 2021 (r569172) +++ head/MOVED Thu Mar 25 01:00:29 2021 (r569173) @@ -15351,7 +15351,6 @@ games/xminesweep||2020-08-27|Has expired: Broken for m graphics/backfract||2020-08-27|Has expired: Broken for more than 6 months japanese/kanjipad||2020-08-27|Has expired: Broken for more than 6 months japanese/xdtp||2020-08-27|Has expired: Broken for more than 6 months -math/openmesh||2020-08-27|Has expired: Broken for more than 6 months math/rehearse||2020-08-27|Has expired: Broken for more than 6 months net/hinfo||2020-08-27|Has expired: Broken for more than 6 months science/fleur||2020-08-27|Has expired: Broken for more than 6 months Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Thu Mar 25 00:58:09 2021 (r569172) +++ head/math/Makefile Thu Mar 25 01:00:29 2021 (r569173) @@ -546,6 +546,7 @@ SUBDIR += onednn SUBDIR += openblas SUBDIR += openlibm + SUBDIR += openmesh SUBDIR += opensolaris-libm SUBDIR += openturns SUBDIR += optpp Modified: head/math/openmesh/Makefile ============================================================================== --- head/math/openmesh/Makefile Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/Makefile Thu Mar 25 01:00:29 2021 (r569173) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= openmesh -DISTVERSION= 8.0 +DISTVERSION= 8.1 CATEGORIES= math MASTER_SITES= http://www.openmesh.org/media/Releases/${DISTVERSION}/ DISTNAME= OpenMesh-${DISTVERSION} @@ -11,10 +11,6 @@ COMMENT= Generic data structure for manipulating polyg LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN= Fails to build with cmake-3.16.0 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 USES= cmake compiler:c++11-lang dos2unix gl qt:5 xorg DOS2UNIX_FILES= src/OpenMesh/Tools/CMakeLists.txt Modified: head/math/openmesh/distinfo ============================================================================== --- head/math/openmesh/distinfo Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/distinfo Thu Mar 25 01:00:29 2021 (r569173) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564278933 -SHA256 (OpenMesh-8.0.tar.gz) = 8974d44026cacaa37b171945b5c96a284bfd32c9df9d671d62931050d057ec82 -SIZE (OpenMesh-8.0.tar.gz) = 26373362 +TIMESTAMP = 1616633090 +SHA256 (OpenMesh-8.1.tar.gz) = 0953777f483d47ea9fa00c329838443a7a09dde8be77bf7de188001cb9e768a7 +SIZE (OpenMesh-8.1.tar.gz) = 26934610 Modified: head/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,6 +1,6 @@ ---- src/OpenMesh/Apps/Decimating/decimater.cc.orig 2018-10-21 23:36:03 UTC +--- src/OpenMesh/Apps/Decimating/decimater.cc.orig 2020-03-12 13:55:53 UTC +++ src/OpenMesh/Apps/Decimating/decimater.cc -@@ -58,6 +58,9 @@ +@@ -53,6 +53,9 @@ #include <string> #include <memory> #include <map> Modified: head/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,12 +1,12 @@ ---- src/OpenMesh/Apps/Decimating/decimaterviewer.cc.orig 2018-10-21 23:51:30 UTC +--- src/OpenMesh/Apps/Decimating/decimaterviewer.cc.orig 2020-03-12 13:55:53 UTC +++ src/OpenMesh/Apps/Decimating/decimaterviewer.cc -@@ -63,6 +63,9 @@ - #else - #include <GL/glut.h> +@@ -44,6 +44,9 @@ + #ifdef _MSC_VER + # pragma warning(disable: 4267 4311) #endif +#if defined(__FreeBSD__) +#include <unistd.h> +#endif - void usage_and_exit(int xcode); - + #include <iostream> + #include <fstream> Modified: head/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,12 +1,12 @@ ---- src/OpenMesh/Apps/QtViewer/meshviewer.cc.orig 2018-10-21 23:50:54 UTC +--- src/OpenMesh/Apps/QtViewer/meshviewer.cc.orig 2020-03-12 13:55:53 UTC +++ src/OpenMesh/Apps/QtViewer/meshviewer.cc -@@ -63,6 +63,9 @@ - #else - #include <GL/glut.h> +@@ -42,6 +42,9 @@ + #ifdef _MSC_VER + # pragma warning(disable: 4267 4311) #endif +#if defined(__FreeBSD__) +#include <unistd.h> +#endif - #include "MeshViewerWidget.hh" - + #include <iostream> + #include <fstream> Modified: head/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,6 +1,6 @@ ---- src/OpenMesh/Apps/Smoothing/smooth.cc.orig 2018-10-21 23:39:56 UTC +--- src/OpenMesh/Apps/Smoothing/smooth.cc.orig 2020-03-12 13:55:53 UTC +++ src/OpenMesh/Apps/Smoothing/smooth.cc -@@ -53,6 +53,9 @@ +@@ -48,6 +48,9 @@ #include <OpenMesh/Tools/Utils/Timer.hh> #include <OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh> #include <OpenMesh/Tools/Utils/getopt.h> Modified: head/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,6 +1,6 @@ ---- src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc.orig 2018-10-21 23:38:04 UTC +--- src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc.orig 2020-03-12 13:55:53 UTC +++ src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc -@@ -67,6 +67,9 @@ +@@ -62,6 +62,9 @@ # include <cmath> using std::pow; #endif Modified: head/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,6 +1,6 @@ ---- src/OpenMesh/Apps/Subdivider/subdivider.cc.orig 2018-10-21 23:37:26 UTC +--- src/OpenMesh/Apps/Subdivider/subdivider.cc.orig 2020-03-12 13:55:53 UTC +++ src/OpenMesh/Apps/Subdivider/subdivider.cc -@@ -48,6 +48,9 @@ +@@ -43,6 +43,9 @@ #include <iostream> #include <sstream> Modified: head/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,6 +1,6 @@ ---- src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc.orig 2018-10-21 23:40:29 UTC +--- src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc.orig 2020-03-12 13:55:54 UTC +++ src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc -@@ -56,6 +56,9 @@ +@@ -51,6 +51,9 @@ #include <limits> #include <exception> #include <cmath> Modified: head/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,6 +1,6 @@ ---- src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc.orig 2018-10-21 23:38:43 UTC +--- src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc.orig 2020-03-12 13:55:54 UTC +++ src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc -@@ -50,6 +50,9 @@ +@@ -45,6 +45,9 @@ #include <iostream> #include <sstream> #include <cmath> Modified: head/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,6 +1,6 @@ ---- src/OpenMesh/Apps/mconvert/mconvert.cc.orig 2018-10-21 23:39:10 UTC +--- src/OpenMesh/Apps/mconvert/mconvert.cc.orig 2020-03-12 13:55:54 UTC +++ src/OpenMesh/Apps/mconvert/mconvert.cc -@@ -50,6 +50,9 @@ +@@ -45,6 +45,9 @@ #include <iterator> #include <fstream> #include <string> Modified: head/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt Thu Mar 25 01:00:29 2021 (r569173) @@ -1,6 +1,6 @@ ---- src/OpenMesh/Core/CMakeLists.txt.orig 2018-10-22 04:57:49 UTC +--- src/OpenMesh/Core/CMakeLists.txt.orig 2020-03-12 13:55:54 UTC +++ src/OpenMesh/Core/CMakeLists.txt -@@ -45,7 +45,7 @@ if (WIN32) +@@ -41,7 +41,7 @@ if (WIN32) endif() else () Modified: head/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt Thu Mar 25 01:00:29 2021 (r569173) @@ -1,6 +1,6 @@ ---- src/OpenMesh/Tools/CMakeLists.txt.orig 2017-01-08 22:09:58 UTC +--- src/OpenMesh/Tools/CMakeLists.txt.orig 2021-03-25 00:45:18 UTC +++ src/OpenMesh/Tools/CMakeLists.txt -@@ -46,7 +46,7 @@ if (WIN32) +@@ -43,7 +43,7 @@ if (WIN32) endif() else () @@ -9,7 +9,7 @@ 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 () +@@ -51,7 +51,7 @@ endif () target_link_libraries (OpenMeshTools OpenMeshCore) IF( NOT WIN32 ) @@ -18,7 +18,7 @@ ENDIF(NOT WIN32) if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS ) -@@ -70,7 +70,7 @@ if ( (${PROJECT_NAME} MATCHES "OpenMesh" +@@ -67,7 +67,7 @@ if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_AP if (APPLE) # let bundle generation depend on target add_dependencies (fixbundle OpenMeshTools) Modified: head/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc ============================================================================== --- head/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc Thu Mar 25 01:00:29 2021 (r569173) @@ -1,29 +1,29 @@ ---- src/OpenMesh/Tools/Utils/Timer.cc.orig 2018-10-21 23:42:34 UTC +--- src/OpenMesh/Tools/Utils/Timer.cc.orig 2020-03-12 13:55:54 UTC +++ src/OpenMesh/Tools/Utils/Timer.cc -@@ -46,6 +46,8 @@ - * * - \*===========================================================================*/ +@@ -41,6 +41,8 @@ + + +#include <sys/time.h> + #ifndef DOXY_IGNORE_THIS // ---------------------------------------------------------------------------- #include <OpenMesh/Core/System/config.h> -@@ -188,7 +190,7 @@ protected: +@@ -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(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__) -+#elif 0 && (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__) +-#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> -@@ -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; Modified: head/math/openmesh/pkg-plist ============================================================================== --- head/math/openmesh/pkg-plist Thu Aug 27 09:36:41 2020 (r546332) +++ head/math/openmesh/pkg-plist Thu Mar 25 01:00:29 2021 (r569173) @@ -65,13 +65,18 @@ include/OpenMesh/Core/Mesh/BaseKernel.hh include/OpenMesh/Core/Mesh/BaseMesh.hh include/OpenMesh/Core/Mesh/Casts.hh include/OpenMesh/Core/Mesh/CirculatorsT.hh +include/OpenMesh/Core/Mesh/DefaultPolyMesh.hh +include/OpenMesh/Core/Mesh/DefaultTriMesh.hh include/OpenMesh/Core/Mesh/FinalMeshItemsT.hh include/OpenMesh/Core/Mesh/Handles.hh include/OpenMesh/Core/Mesh/IteratorsT.hh include/OpenMesh/Core/Mesh/PolyConnectivity.hh +include/OpenMesh/Core/Mesh/PolyConnectivity_inline_impl.hh include/OpenMesh/Core/Mesh/PolyMeshT.hh include/OpenMesh/Core/Mesh/PolyMeshT_impl.hh include/OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh +include/OpenMesh/Core/Mesh/SmartHandles.hh +include/OpenMesh/Core/Mesh/SmartRange.hh include/OpenMesh/Core/Mesh/Status.hh include/OpenMesh/Core/Mesh/Tags.hh include/OpenMesh/Core/Mesh/Traits.hh @@ -103,6 +108,7 @@ include/OpenMesh/Core/Utils/RandomNumberGenerator.hh include/OpenMesh/Core/Utils/SingletonT.hh include/OpenMesh/Core/Utils/SingletonT_impl.hh include/OpenMesh/Core/Utils/color_cast.hh +include/OpenMesh/Core/Utils/typename.hh include/OpenMesh/Core/Utils/vector_cast.hh include/OpenMesh/Core/Utils/vector_traits.hh include/OpenMesh/Tools/Decimater/BaseDecimaterT.hh @@ -192,6 +198,9 @@ include/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh include/OpenMesh/Tools/VDPM/VHierarchyWindow.hh include/OpenMesh/Tools/VDPM/ViewingParameters.hh lib/libOpenMeshCore.so -lib/libOpenMeshCore.so.8.0 +lib/libOpenMeshCore.so.8.1 lib/libOpenMeshTools.so -lib/libOpenMeshTools.so.8.0 +lib/libOpenMeshTools.so.8.1 +libdata/pkgconfig/openmesh.pc +share/OpenMesh/cmake/OpenMeshConfig-%%CMAKE_BUILD_TYPE%%.cmake +share/OpenMesh/cmake/OpenMeshConfig.cmake
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103250100.12P10UIt028248>