diff --git a/ports/openmesh/portfile.cmake b/ports/openmesh/portfile.cmake index d5fca6adc77af6..573dfc9a68ca64 100644 --- a/ports/openmesh/portfile.cmake +++ b/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") diff --git a/ports/openmesh/restore-c++11-compatibility.patch b/ports/openmesh/restore-c++11-compatibility.patch deleted file mode 100644 index 1122642e0974b7..00000000000000 --- a/ports/openmesh/restore-c++11-compatibility.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1d4a866282ace376c8e3ba05c21ce3bcc6643040 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20M=C3=B6bius?= -Date: Tue, 9 Jan 2024 12:59:45 +0100 -Subject: [PATCH] Small patch to keep backward compatibility with c++11 - ---- - src/OpenMesh/Core/Utils/Property.hh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh -index 485d3072..6ba66584 100644 ---- a/src/OpenMesh/Core/Utils/Property.hh -+++ b/src/OpenMesh/Core/Utils/Property.hh -@@ -250,7 +250,7 @@ public: // inherited from BaseProperty - virtual void reserve(size_t _n) override { data_.reserve(_n); } - virtual void resize(size_t _n) override { data_.resize(_n); } - virtual void clear() override { data_.clear(); vector_type().swap(data_); } -- virtual void push_back() override { data_.emplace_back(); } -+ virtual void push_back() override { data_.push_back(bool()); } - virtual void swap(size_t _i0, size_t _i1) override - { bool t(data_[_i0]); data_[_i0]=data_[_i1]; data_[_i1]=t; } - virtual void copy(size_t _i0, size_t _i1) override --- -GitLab - diff --git a/ports/openmesh/support-arm64-win.patch b/ports/openmesh/support-arm64-win.patch new file mode 100644 index 00000000000000..3e7e1ef2bcccd1 --- /dev/null +++ b/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 + # include + #endif ++#if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined (__MINGW32__) ) ++# include ++#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 +-#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 diff --git a/ports/openmesh/vcpkg.json b/ports/openmesh/vcpkg.json index 72e55cee995218..50448b11997cf3 100644 --- a/ports/openmesh/vcpkg.json +++ b/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", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5629e348f0d56a..a05d22f73ad5ce 100644 --- a/scripts/ci.baseline.txt +++ b/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 diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index a85bc6890cc9f2..02e577998f83cc 100644 --- a/scripts/ci.feature.baseline.txt +++ b/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 diff --git a/versions/baseline.json b/versions/baseline.json index 7a9285bade6283..b6cc3203d2fd13 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7357,7 +7357,7 @@ "port-version": 3 }, "openmesh": { - "baseline": "10.0", + "baseline": "11.0", "port-version": 0 }, "openmpi": { diff --git a/versions/o-/openmesh.json b/versions/o-/openmesh.json index ebb2825e3df700..4a2be28189d2b7 100644 --- a/versions/o-/openmesh.json +++ b/versions/o-/openmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9172f0bcc1a3f826956e7438f12be1544d9b0e2b", + "version": "11.0", + "port-version": 0 + }, { "git-tree": "bea5d6796009e8156570bbfae1c9fb60d86d7286", "version": "10.0",