[packages/GLM] switch to git snapshot (20230818)
atler
atler at pld-linux.org
Thu Oct 12 18:49:07 CEST 2023
commit 344ac6d5e0329b5901722f5e58f97cfaf21fd06f
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Oct 12 16:40:10 2023 +0200
switch to git snapshot (20230818)
- provides install target and cmake config
- include -fno-ipa-modref in CXXFLAGS to fix failing test:
https://github.com/g-truc/glm/pull/1087
GLM.spec | 20 +++++++++++++-------
x32.patch | 28 ++++++++++++++--------------
2 files changed, 27 insertions(+), 21 deletions(-)
---
diff --git a/GLM.spec b/GLM.spec
index 4b73041..c4f98bb 100644
--- a/GLM.spec
+++ b/GLM.spec
@@ -3,16 +3,20 @@
%bcond_without tests # build without tests
%bcond_with p7zip # plain p7zip (compatible with both rpm4/rpm5)
#
+%define gitref 47585fde0c49fa77a2bf2fb1d2ead06999fd4b6e
+%define snap 20230818
+%define rel 1
+
Summary: OpenGL Mathematics (GLM) - C++ mathematics library for GLSL
Summary(pl.UTF-8): OpenGL Mathematics (GLM) - biblioteka matematyczna C++ dla GLSL
Name: GLM
-Version: 0.9.9.8
-Release: 1
+Version: 0.9.9.9
+Release: 0.%{snap}.%{rel}
License: MIT
Group: Development/Libraries
#Source0Download: https://github.com/g-truc/glm/releases
-Source0: https://github.com/g-truc/glm/releases/download/%{version}/glm-%{version}.7z
-# Source0-md5: c8342552801ebeb31497288192c4e793
+Source0: https://github.com/g-truc/glm/archive/%{gitref}/%{name}-%{snap}.tar.gz
+# Source0-md5: b288cb704cca5d1cd46be724ce61f428
Patch0: x32.patch
URL: https://glm.g-truc.net/
BuildRequires: cmake >= 3.2
@@ -43,13 +47,14 @@ graficznych opartych na specyfikacji OpenGL Shading Language (GLSL).
%setup -q -c -T -n glm
7z x %{SOURCE0} -o..
%else
-%setup -q -n glm
+%setup -q -n glm-%{gitref}
%endif
%patch0 -p1
%build
mkdir build
cd build
+CXXFLAGS="%{rpmcxxflags} -fno-ipa-modref" \
%cmake .. \
-DGLM_TEST_ENABLE:BOOL=%{!?with_tests:OFF}%{?with_tests:ON}
@@ -60,9 +65,9 @@ cd build
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_includedir}
-cp -a glm $RPM_BUILD_ROOT%{_includedir}
+%{__make} -C build install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -71,3 +76,4 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc manual.md readme.md
%{_includedir}/glm
+%{_libdir}/cmake/glm
diff --git a/x32.patch b/x32.patch
index 37c5572..00f7665 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,17 +1,17 @@
--- glm/test/core/core_setup_message.cpp.orig 2020-03-19 23:36:32.000000000 +0100
+++ glm/test/core/core_setup_message.cpp 2020-03-19 23:43:46.417701188 +0100
@@ -155,7 +155,13 @@
- {
- int Error = 0;
-
-- Error += ((sizeof(void*) == 4) && (GLM_MODEL == GLM_MODEL_32)) || ((sizeof(void*) == 8) && (GLM_MODEL == GLM_MODEL_64)) ? 0 : 1;
-+ Error +=
-+ ((sizeof(void*) == 4) && (GLM_MODEL == GLM_MODEL_32)) ||
-+ ((sizeof(void*) == 8) && (GLM_MODEL == GLM_MODEL_64))
-+#ifdef __ILP32__
-+ || ((sizeof(void*) == 4) && (GLM_MODEL == GLM_MODEL_64))
-+#endif
-+ ? 0 : 1;
-
- if(GLM_MODEL == GLM_MODEL_32)
- std::printf("GLM_MODEL_32\n");
+ {
+ int Error = 0;
+
+- Error += ((sizeof(void*) == 4) && (GLM_MODEL == GLM_MODEL_32)) || ((sizeof(void*) == 8) && (GLM_MODEL == GLM_MODEL_64)) ? 0 : 1;
++ Error +=
++ ((sizeof(void*) == 4) && (GLM_MODEL == GLM_MODEL_32)) ||
++ ((sizeof(void*) == 8) && (GLM_MODEL == GLM_MODEL_64))
++#ifdef __ILP32__
++ || ((sizeof(void*) == 4) && (GLM_MODEL == GLM_MODEL_64))
++#endif
++ ? 0 : 1;
+
+ if(GLM_MODEL == GLM_MODEL_32)
+ std::printf("GLM_MODEL_32\n");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/GLM.git/commitdiff/344ac6d5e0329b5901722f5e58f97cfaf21fd06f
More information about the pld-cvs-commit
mailing list