[packages/wayfire] make it explicit that header only GLM is needed

atler atler at pld-linux.org
Sat Jun 29 03:01:35 CEST 2024


commit 7c4022907a851a7547b27a18db5c3be192df7d11
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Jun 29 01:04:10 2024 +0200

    make it explicit that header only GLM is needed

 glm.patch    | 26 ++++++++++++++++++++++++++
 wayfire.spec |  2 ++
 2 files changed, 28 insertions(+)
---
diff --git a/wayfire.spec b/wayfire.spec
index e9e0191..033a415 100644
--- a/wayfire.spec
+++ b/wayfire.spec
@@ -13,6 +13,7 @@ Group:		Applications
 Source0:	https://github.com/WayfireWM/wayfire/releases/download/v%{version}/%{name}-%{version}.tar.xz
 # Source0-md5:	36e88c89c0be0e6af725ecab15049ecb
 Patch0:		no-git-check.patch
+Patch1:		glm.patch
 URL:		https://wayfire.org/
 BuildRequires:	EGL-devel
 BuildRequires:	GLM-devel >= 0.9.9.9
@@ -117,6 +118,7 @@ Biblioteki statyczne wayfire.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %meson build \
diff --git a/glm.patch b/glm.patch
new file mode 100644
index 0000000..368d6c0
--- /dev/null
+++ b/glm.patch
@@ -0,0 +1,26 @@
+--- wayfire-0.8.0/meson.build.orig	2024-06-28 23:37:15.218293323 +0200
++++ wayfire-0.8.0/meson.build	2024-06-29 00:00:36.554167930 +0200
+@@ -25,7 +25,10 @@
+ drm            = dependency('libdrm')
+ egl            = dependency('egl')
+ glesv2         = dependency('glesv2')
++glm = dependency('glm', modules: ['glm::glm-header-only'], required: false)
++if not glm.found()
+ glm            = dependency('glm')
++endif
+ libinput       = dependency('libinput', version: '>=1.7.0')
+ pixman         = dependency('pixman-1')
+ threads        = dependency('threads')
+--- wayfire-0.8.0/subprojects/wf-touch/meson.build.orig	2021-03-19 15:56:39.000000000 +0100
++++ wayfire-0.8.0/subprojects/wf-touch/meson.build	2024-06-29 00:16:24.536784735 +0200
+@@ -3,7 +3,10 @@
+ 		    meson_version: '>=0.47.0',
+ 		    default_options : ['cpp_std=c++17'])
+ 
++glm = dependency('glm', modules: ['glm::glm-header-only'], required: false)
++if not glm.found()
+ glm = dependency('glm')
++endif
+ 
+ wf_touch_inc_dirs = include_directories('.')
+ install_headers([
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wayfire.git/commitdiff/66e63d38b670412a9b2eb47142a97e5f44ebaf50



More information about the pld-cvs-commit mailing list