[openmesh] update to 11.0

ports/openmesh/portfile.cmake

@@ -1,47 +1,43 @@
-# Note: upstream GitLab instance at https://graphics.rwth-aachen.de:9000 often goes down
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.0.tar.gz"
-    FILENAME "OpenMesh-${VERSION}.tar.gz"
-    SHA512 b895e5eaabdf5d3671625df5314e1f95921ac672e9d9d945a5cf0973e20b4e395aac6517d86269a2e8c103f32bc9c8c2ecf57d811a260bbc69f592043e1307ba
-)
-
-vcpkg_extract_source_archive(
-    SOURCE_PATH
-    ARCHIVE "${ARCHIVE}"
-    PATCHES
-        fix-library-install-path.patch
-        fix-pkgconfig.patch
-
-        # This patch is a combination of these two:
-        # https://gitlab.vci.rwth-aachen.de:9000/OpenMesh/OpenMesh/-/commit/1d4a866282ace376c8e3ba05c21ce3bcc6643040
-        # https://gitlab.vci.rwth-aachen.de:9000/OpenMesh/OpenMesh/-/commit/a7f30b6f70447932444f5b518840ca26e9461fa9
-        restore-c++11-compatibility.patch
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-  set(OPENMESH_BUILD_SHARED ON)
-else()
-  set(OPENMESH_BUILD_SHARED OFF)
-endif()
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_APPS=OFF
-        -DVCI_COMMON_DO_NOT_COPY_POST_BUILD=ON
-        -DVCI_NO_LIBRARY_INSTALL=ON
-        -DOPENMESH_BUILD_SHARED=${OPENMESH_BUILD_SHARED}
-	MAYBE_UNUSED_VARIABLES
-		OPENMESH_BUILD_SHARED
-        # [TODO]: add apps as feature, requires qt5 and freeglut
-)
-
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(PACKAGE_NAME OpenMesh CONFIG_PATH "share/OpenMesh/cmake")
-vcpkg_fixup_pkgconfig()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm")
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+# Note: upstream GitLab instance at https://graphics.rwth-aachen.de:9000 often goes down
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.0.tar.gz"
+    FILENAME "OpenMesh-${VERSION}.tar.gz"
+    SHA512 f6d082c58d31be4baff8f42f02a471fd655f0485da6a0a93fbb05c02670b86c9b9238e6d7bebb065a20e6e7264da4eb7c60f95ade590c752e0e3eb656e5835b1
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        fix-library-install-path.patch
+        fix-pkgconfig.patch
+        support-arm64-win.patch
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+  set(OPENMESH_BUILD_SHARED ON)
+else()
+  set(OPENMESH_BUILD_SHARED OFF)
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_APPS=OFF
+        -DVCI_COMMON_DO_NOT_COPY_POST_BUILD=ON
+        -DVCI_NO_LIBRARY_INSTALL=ON
+        -DOPENMESH_BUILD_SHARED=${OPENMESH_BUILD_SHARED}
+	MAYBE_UNUSED_VARIABLES
+		OPENMESH_BUILD_SHARED
+        # [TODO]: add apps as feature, requires qt5 and freeglut
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME OpenMesh CONFIG_PATH "share/OpenMesh/cmake")
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/openmesh/support-arm64-win.patch

@@ -0,0 +1,58 @@
+diff --git a/src/OpenMesh/Tools/Utils/Timer.cc b/src/OpenMesh/Tools/Utils/Timer.cc
+index e3fca04..9c77717 100644
+--- a/src/OpenMesh/Tools/Utils/Timer.cc
++++ b/src/OpenMesh/Tools/Utils/Timer.cc
+@@ -51,6 +51,9 @@
+ #  include <cmath>
+ #  include <cstdio>
+ #endif
++#if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined (__MINGW32__) )
++#  include <windows.h>
++#endif
+ #include "Timer.hh"
+ // ----------------------------------------------------------------------------
+
+@@ -85,10 +88,6 @@ public:
+ // ------------------------------------------------------------- windows 32 ----
+ #if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined (__MINGW32__) )
+
+-#ifndef DOXY_IGNORE_THIS
+-#include <windows.h>
+-#endif
+-
+ class TimerImplWin32 : public TimerImpl
+ {
+ protected:
+@@ -109,7 +108,7 @@ public:
+
+ TimerImplWin32::TimerImplWin32(void)
+ {
+-   if (QueryPerformanceFrequency(&freq_)==FALSE)
++   if (::QueryPerformanceFrequency(&freq_)==FALSE)
+      throw std::runtime_error("Performance counter of of stock!");
+
+    memset(&count_,0,sizeof(count_));
+@@ -125,20 +124,20 @@ void TimerImplWin32::reset(void)
+ void TimerImplWin32::start(void)
+ {
+    reset();
+-   QueryPerformanceCounter(&start_);
++   ::QueryPerformanceCounter(&start_);
+ }
+
+ void TimerImplWin32::stop(void)
+ {
+    LARGE_INTEGER stop_;
+
+-   QueryPerformanceCounter(&stop_);
++   ::QueryPerformanceCounter(&stop_);
+    count_.QuadPart += stop_.QuadPart - start_.QuadPart;
+ }
+
+ void TimerImplWin32::cont(void)
+ {
+-   QueryPerformanceCounter(&start_);
++   ::QueryPerformanceCounter(&start_);
+ }
+
+ double TimerImplWin32::seconds(void) const

ports/openmesh/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "openmesh",
-  "version": "10.0",
+  "version": "11.0",
   "description": "A generic and efficient polygon mesh data structure",
   "homepage": "https://www.graphics.rwth-aachen.de/media/openmesh_static/Daily-Builds/Doc/index.html",
   "license": "BSD-3-Clause",

scripts/ci.baseline.txt

@@ -526,7 +526,6 @@ openldap:arm64-linux=fail
 openmama:arm64-windows-static-md=fail
 openmama:x64-windows-static-md=fail
 openmesh:arm64-windows-static-md=fail
-openmesh:arm64-windows=fail
 openmpi:arm-neon-android=fail
 openmpi:arm64-android=fail
 openmpi:x64-android=fail

scripts/ci.feature.baseline.txt

@@ -970,7 +970,6 @@ openmama:arm64-linux=cascade
 openmama:arm64-windows=cascade
 openmama:x64-windows-static-md=fail
 openmama:x64-windows-static=cascade
-openmesh:arm64-windows=fail
 openmpi:arm-neon-android=fail
 openmpi:arm64-android=fail
 openmpi:x64-android=fail

versions/baseline.json

@@ -7357,7 +7357,7 @@
       "port-version": 3
     },
     "openmesh": {
-      "baseline": "10.0",
+      "baseline": "11.0",
       "port-version": 0
     },
     "openmpi": {

versions/o-/openmesh.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9172f0bcc1a3f826956e7438f12be1544d9b0e2b",
+      "version": "11.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bea5d6796009e8156570bbfae1c9fb60d86d7286",
       "version": "10.0",