[packages/GLM] - added types patch (fixes tests build on x32)

qboosh qboosh at pld-linux.org
Thu May 30 14:18:05 CEST 2024


commit 41ff96a7310b4d31ea4152d5ea698f4b3e8bff2d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu May 30 13:29:32 2024 +0200

    - added types patch (fixes tests build on x32)

 GLM-types.patch | 11 +++++++++++
 GLM.spec        |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/GLM.spec b/GLM.spec
index 07a6a5e..fbf7ef4 100644
--- a/GLM.spec
+++ b/GLM.spec
@@ -13,6 +13,7 @@ Group:		Libraries
 Source0:	https://github.com/g-truc/glm/archive/%{version}/glm-%{version}.tar.gz
 # Source0-md5:	f824ac50e16310a95279032f82cbd341
 Patch0:		x32.patch
+Patch1:		%{name}-types.patch
 URL:		https://glm.g-truc.net/
 BuildRequires:	cmake >= 3.6
 %{?with_tests:BuildRequires:	libstdc++-devel}
@@ -47,6 +48,7 @@ graficznych opartych na specyfikacji OpenGL Shading Language (GLSL).
 %prep
 %setup -q -n glm-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 mkdir build
diff --git a/GLM-types.patch b/GLM-types.patch
new file mode 100644
index 0000000..b112ea9
--- /dev/null
+++ b/GLM-types.patch
@@ -0,0 +1,11 @@
+--- glm-1.0.1/test/core/core_func_matrix.cpp.orig	2024-02-27 18:19:47.000000000 +0100
++++ glm-1.0.1/test/core/core_func_matrix.cpp	2024-05-30 13:20:49.089552367 +0200
+@@ -392,7 +392,7 @@ static int test_inverse_perf(std::size_t
+ 	//glm::uint Ulp = 0;
+ 	//Ulp = glm::max(glm::float_distance(*Dst, *Src), Ulp);
+ 
+-	std::printf("inverse<%s>(%f): %lu\n", Message, static_cast<double>(Diff), EndTime - StartTime);
++	std::printf("inverse<%s>(%f): %llu\n", Message, static_cast<double>(Diff), (unsigned long long)(EndTime - StartTime));
+ 
+ 	return 0;
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/GLM.git/commitdiff/41ff96a7310b4d31ea4152d5ea698f4b3e8bff2d



More information about the pld-cvs-commit mailing list