glm: Upgrade to 1.0.1
c++20.patch.0 got obseleted in
6fdeff4d67
Change-Id: I8698968b55f299c55777fe280b3eda9e2bea9cdc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167268
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
parent
d52a4dba6a
commit
01fe29c78d
4 changed files with 11 additions and 23 deletions
|
@ -277,8 +277,8 @@ FROZEN_TARBALL := frozen-1.1.1.tar.gz
|
|||
# three static lines
|
||||
# so that git cherry-pick
|
||||
# will not run into conflicts
|
||||
GLM_SHA256SUM := 6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
|
||||
GLM_TARBALL := glm-0.9.9.8.zip
|
||||
GLM_SHA256SUM := 09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5
|
||||
GLM_TARBALL := glm-1.0.1.zip
|
||||
# three static lines
|
||||
# so that git cherry-pick
|
||||
# will not run into conflicts
|
||||
|
|
1
external/glm/UnpackedTarball_glm.mk
vendored
1
external/glm/UnpackedTarball_glm.mk
vendored
|
@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
|
|||
|
||||
$(eval $(call gb_UnpackedTarball_add_patches,glm, \
|
||||
external/glm/clang-cl.patch.0 \
|
||||
external/glm/c++20.patch.0 \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
|
|
11
external/glm/c++20.patch.0
vendored
11
external/glm/c++20.patch.0
vendored
|
@ -1,11 +0,0 @@
|
|||
--- glm/detail/type_half.inl
|
||||
+++ glm/detail/type_half.inl
|
||||
@@ -6,7 +6,7 @@
|
||||
volatile float f = 1e10;
|
||||
|
||||
for(int i = 0; i < 10; ++i)
|
||||
- f *= f; // this will overflow before the for loop terminates
|
||||
+ f = f * f; // this will overflow before the for loop terminates
|
||||
return f;
|
||||
}
|
||||
|
Loading…
Reference in a new issue