From 01fe29c78d21951be45bf8957092786d67c70b8e Mon Sep 17 00:00:00 2001
From: Xisco Fauli <xiscofauli@libreoffice.org>
Date: Tue, 7 May 2024 11:32:41 +0200
Subject: [PATCH] glm: Upgrade to 1.0.1

c++20.patch.0 got obseleted in
https://github.com/g-truc/glm/commit/6fdeff4d67f3db493d47c44da20aa1efaa6574ef

Change-Id: I8698968b55f299c55777fe280b3eda9e2bea9cdc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167268
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
 download.lst                        |  4 ++--
 external/glm/UnpackedTarball_glm.mk |  1 -
 external/glm/c++20.patch.0          | 11 -----------
 external/glm/clang-cl.patch.0       | 18 +++++++++---------
 4 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 external/glm/c++20.patch.0

diff --git a/download.lst b/download.lst
index 28538879f5ec..27ffbbb97306 100644
--- a/download.lst
+++ b/download.lst
@@ -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
diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk
index 934621eac841..78226f44cc08 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -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:
diff --git a/external/glm/c++20.patch.0 b/external/glm/c++20.patch.0
deleted file mode 100644
index 9fdd813a1e53..000000000000
--- a/external/glm/c++20.patch.0
+++ /dev/null
@@ -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;
- 	}
- 
diff --git a/external/glm/clang-cl.patch.0 b/external/glm/clang-cl.patch.0
index e5536e145094..6ba15fb788b1 100644
--- a/external/glm/clang-cl.patch.0
+++ b/external/glm/clang-cl.patch.0
@@ -3,12 +3,12 @@
 --- glm/detail/func_integer.inl
 +++ glm/detail/func_integer.inl
 @@ -3,7 +3,9 @@
- #include "_vectorize.hpp"
- #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
- #	include <intrin.h>
-+#if !defined __clang__
- #	pragma intrinsic(_BitScanReverse)
-+#endif
- #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
- #include <limits>
- 
+ #include "_vectorize.hpp"
+ #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ #	include <intrin.h>
++#if !defined __clang__
+ #	pragma intrinsic(_BitScanReverse)
++#endif
+ #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ #include <limits>
+