From d25d2993c3f1c44966773b510de68ac353ed8cf4 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 11 Feb 2025 09:49:52 +0100 Subject: [PATCH] Just print errnum --- ports/colmap/{glew-get-error-string.diff => no-glu.diff} | 4 ++-- ports/colmap/portfile.cmake | 2 +- versions/c-/colmap.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename ports/colmap/{glew-get-error-string.diff => no-glu.diff} (82%) diff --git a/ports/colmap/glew-get-error-string.diff b/ports/colmap/no-glu.diff similarity index 82% rename from ports/colmap/glew-get-error-string.diff rename to ports/colmap/no-glu.diff index c4579f66b031ac..44f1920e93f575 100644 --- a/ports/colmap/glew-get-error-string.diff +++ b/ports/colmap/no-glu.diff @@ -1,5 +1,5 @@ diff --git a/src/thirdparty/SiftGPU/GlobalUtil.cpp b/src/thirdparty/SiftGPU/GlobalUtil.cpp -index e98ef6b..10fb19b 100644 +index e98ef6b..39435db 100644 --- a/src/thirdparty/SiftGPU/GlobalUtil.cpp +++ b/src/thirdparty/SiftGPU/GlobalUtil.cpp @@ -137,7 +137,7 @@ void GlobalUtil::CheckErrorsGL(const char* location) @@ -7,7 +7,7 @@ index e98ef6b..10fb19b 100644 while (errnum = glGetError()) { - errstr = (const char *)(gluErrorString(errnum)); -+ errstr = (const char *)(glewGetErrorString(errnum)); ++ errstr = nullptr; // just print errnum if(errstr) { std::cerr << errstr; } diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 53bb8bd3c4341f..e9c2e866e158e6 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( SHA512 1260db4346cc33c6c35efdee0157450fccef67dbc9de876fdc997c7cb90daec716e5ccec97df0a77e3e8686f43ec79f2c0a1523ea12eca2ee158347cb52dea48 HEAD_REF main PATCHES - glew-get-error-string.diff + no-glu.diff ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 3dc84388c9094c..94eca6b5aa8ba6 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9e924da50379a927afa2980cf7c77efe0fc822ba", + "git-tree": "7deee951326bf2685951c8d5ff7cbc3618ec5567", "version": "3.11.1", "port-version": 2 },