Skip to content

Commit 780ae2a

Browse files
authored
chore: update glew to 2.3.1 from 2.2.0 custom hash with patch (#1178)
Signed-off-by: Michael Oliver <mcoliver@gmail.com> GLEW was pulling a non release commit hash and then applying a patch. The fix has been rolled into an official release 2.3.1 along with other fixes and improvements. <!-- Thanks for your contribution! Please read this comment in its entirety. It's quite important. When a contributor merges the pull request, the title and the description will be used to build the merge commit! ### Pull Request TITLE It should be in the following format: [ 12345: Summary of the changes made ] Where 12345 is the corresponding Github Issue OR [ Summary of the changes made ] If it's solving something trivial, like fixing a typo. --> ### Linked issues <!-- Link the Issue(s) this Pull Request is related to. Each PR should link to at least one issue, in the form: Use one line for each Issue. This allows auto-closing the related issue when the fix is merged. Fixes #12345 Fixes #54345 --> ### Summarize your change. ### Describe the reason for the change. ### Describe what you have tested and on which operating system. ### Add a list of changes, and note any that might need special attention during the review. ### If possible, provide screenshots.
1 parent 2079e0b commit 780ae2a

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

cmake/defaults/CYCOMMON.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ SET(RV_DEPS_GC_DOWNLOAD_HASH
132132

133133
# glew https://github.com/nigels-com/glew
134134
SET(RV_DEPS_GLEW_VERSION
135-
"e1a80a9f12d7def202d394f46e44cfced1104bfb"
135+
"2.3.1"
136136
)
137137
SET(RV_DEPS_GLEW_DOWNLOAD_HASH
138-
"9bfc689dabeb4e305ce80b5b6f28bcf9"
138+
"e795affc12dda3226e9ae3afcc80ceb9"
139139
)
140140
SET(RV_DEPS_GLEW_VERSION_LIB
141-
"2.2.0"
141+
"2.3.1"
142142
)
143143

144144
# imgui https://github.com/pthom/imgui

cmake/dependencies/glew.cmake

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
RV_CREATE_STANDARD_DEPS_VARIABLES("RV_DEPS_GLEW" "${RV_DEPS_GLEW_VERSION}" "make" "")
88

99
SET(_download_url
10-
"https://github.com/nigels-com/glew/archive/${_version}.zip"
10+
"https://github.com/nigels-com/glew/archive/refs/tags/glew-${_version}.tar.gz"
1111
)
1212

1313
SET(_download_hash
@@ -33,14 +33,8 @@ EXTERNALPROJECT_ADD(
3333
INSTALL_DIR ${_install_dir}
3434
URL ${_download_url}
3535
URL_MD5 ${_download_hash}
36-
DOWNLOAD_NAME ${_target}_${_version}.zip
36+
DOWNLOAD_NAME glew-glew-${_version}.tar.gz
3737
DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
38-
# Patch to fix the build issue with OpenGL-Registry Pinning the OpenGL-Registry version to a specific commit https://github.com/nigels-com/glew/issues/449
39-
# Also clone the required glfixes repository
40-
PATCH_COMMAND
41-
cd auto && git clone https://github.com/KhronosGroup/OpenGL-Registry.git || true && cd OpenGL-Registry && git checkout
42-
a77f5b6ffd0b0b74904f755ae977fa278eac4e95 && cd .. && git clone --depth=1 --branch glew https://github.com/nigels-com/glfixes glfixes || true && touch
43-
OpenGL-Registry/.dummy && cd ..
4438
CONFIGURE_COMMAND cd auto && ${_make_command} && cd .. && ${_make_command}
4539
BUILD_COMMAND ${_make_command} -j${_cpu_count} GLEW_DEST=${_install_dir}
4640
INSTALL_COMMAND ${_make_command} install LIBDIR=${_lib_dir} GLEW_DEST=${_install_dir}

0 commit comments

Comments
 (0)