Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[colmap,glew] Avoid GLU #43695

Merged
merged 4 commits into from
Feb 11, 2025
Merged

[colmap,glew] Avoid GLU #43695

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de38b8d
[glew] Burn-in GLEW_NO_GLU
dg0yt Feb 8, 2025
8683b05
[colmap] Avoid GLU
dg0yt Feb 8, 2025
38c1239
[colmap] Avoid wrong GIT_COMMIT_ID
dg0yt Feb 8, 2025
d25d299
Just print errnum
dg0yt Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/colmap/glew-get-error-string.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/thirdparty/SiftGPU/GlobalUtil.cpp b/src/thirdparty/SiftGPU/GlobalUtil.cpp
index e98ef6b..10fb19b 100644
--- a/src/thirdparty/SiftGPU/GlobalUtil.cpp
+++ b/src/thirdparty/SiftGPU/GlobalUtil.cpp
@@ -137,7 +137,7 @@ void GlobalUtil::CheckErrorsGL(const char* location)
const char *errstr;
while (errnum = glGetError())
{
- errstr = (const char *)(gluErrorString(errnum));
+ errstr = (const char *)(glewGetErrorString(errnum));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

colmap/colmap#3144 (comment)

if(errstr) {
std::cerr << errstr;
}
9 changes: 7 additions & 2 deletions ports/colmap/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
set(COLMAP_REF "aa087848a8bd09cebf3e3cc8a5732552f30c51ad") # v3.11.1
# Update both, literally.
set(COLMAP_REF 3.11.1 "682ea9ac4020a143047758739259b3ff04dabe8d")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO colmap/colmap
REF "${VERSION}"
SHA512 1260db4346cc33c6c35efdee0157450fccef67dbc9de876fdc997c7cb90daec716e5ccec97df0a77e3e8686f43ec79f2c0a1523ea12eca2ee158347cb52dea48
HEAD_REF main
PATCHES
glew-get-error-string.diff
)

if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES))
Expand All @@ -15,8 +18,10 @@ endif()
# set GIT_COMMIT_ID and GIT_COMMIT_DATE
if(DEFINED VCPKG_HEAD_VERSION)
set(GIT_COMMIT_ID "${VCPKG_HEAD_VERSION}")
elseif(NOT VERSION IN_LIST COLMAP_REF)
message(FATAL_ERROR "Version ${VERSION} missing in COLMAP_REF (${COLMAP_REF})")
else()
set(GIT_COMMIT_ID "${COLMAP_REF}")
list(GET COLMAP_REF 1 GIT_COMMIT_ID)
endif()

string(TIMESTAMP COLMAP_GIT_COMMIT_DATE "%Y-%m-%d")
Expand Down
2 changes: 1 addition & 1 deletion ports/colmap/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "colmap",
"version": "3.11.1",
"port-version": 1,
"port-version": 2,
"description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
"homepage": "https://colmap.github.io/",
"license": "BSD-3-Clause",
Expand Down
3 changes: 3 additions & 0 deletions ports/glew/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glew)
# Skip check the required dependency opengl
vcpkg_fixup_pkgconfig(SKIP_CHECK)

# Burn-in CMake build config
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/GL/glew.h" "ifndef GLEW_NO_GLU" "if 0")

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
set(_targets_cmake_files)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
Expand Down
2 changes: 1 addition & 1 deletion ports/glew/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "glew",
"version": "2.2.0",
"port-version": 4,
"port-version": 5,
"description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.",
"homepage": "https://github.com/nigels-com/glew",
"supports": "!android",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,7 @@
},
"colmap": {
"baseline": "3.11.1",
"port-version": 1
"port-version": 2
},
"color-console": {
"baseline": "2022-03-20",
Expand Down Expand Up @@ -3130,7 +3130,7 @@
},
"glew": {
"baseline": "2.2.0",
"port-version": 4
"port-version": 5
},
"glfw3": {
"baseline": "3.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/colmap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9e924da50379a927afa2980cf7c77efe0fc822ba",
"version": "3.11.1",
"port-version": 2
},
{
"git-tree": "7f2f32bedf07a0ac7a5bc43b81268b20b41b060e",
"version": "3.11.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/glew.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "deee148de63ca706630edc3408d1c9a471f8884f",
"version": "2.2.0",
"port-version": 5
},
{
"git-tree": "bf42d73479dcd0f239b71dbed4d0d3af22efb294",
"version": "2.2.0",
Expand Down
Loading