From 12b97949ef47161e7117e6092789a00cc8cbaaa7 Mon Sep 17 00:00:00 2001 From: Andreas Naumann Date: Tue, 6 Feb 2024 11:21:44 +0100 Subject: [PATCH] package/glm: Bump to 1.0.0 glm did not install headers since [1], at least in a per-package build. Bumping to 1.0.0 fixes that. The cmake option to avoid building the lib has changed Partially fixes [2], where cegui failed to configure because of the missing glm headers. It also fixes kodi-screensaver and kodi-visualisation (no autobuidl failures so far): CMake Error at [...]/output/per-package/kodi-screensaver-asteroids/host/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find glm (missing: GLM_INCLUDE_DIR) [1] 01ad113 package/glm: bump to version 0.9.9.8 [2] http://autobuild.buildroot.org/results/241/241a60f8ecb6fec5dc122d64dd438dd4249f8c3e/ Signed-off-by: Andreas Naumann [yann.morin.1998@free.fr: add kodi failures from Bernd] Signed-off-by: Yann E. MORIN --- package/glm/glm.hash | 2 +- package/glm/glm.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/glm/glm.hash b/package/glm/glm.hash index c4e2101604..0084bd0930 100644 --- a/package/glm/glm.hash +++ b/package/glm/glm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz +sha256 e51f6c89ff33b7cfb19daafb215f293d106cd900f8d681b9b1295312ccadbd23 glm-1.0.0.tar.gz sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt diff --git a/package/glm/glm.mk b/package/glm/glm.mk index ef549931f6..ce8efc11a7 100644 --- a/package/glm/glm.mk +++ b/package/glm/glm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLM_VERSION = 0.9.9.8 +GLM_VERSION = 1.0.0 GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) GLM_LICENSE = MIT GLM_LICENSE_FILES = copying.txt @@ -17,7 +17,6 @@ GLM_INSTALL_TARGET = NO # Don't build libraries as GLM is header-only GLM_CONF_OPTS = \ -DGLM_TEST_ENABLE=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_STATIC_LIBS=OFF + -DGLM_BUILD_LIBRARY=OFF $(eval $(cmake-package))