mbakke pushed a commit to branch staging2
in repository guix.
commit 460f1140a0a28cd93eb1eca6c75241961b4c0391
Author: Marius Bakke <[email protected]>
AuthorDate: Thu May 21 22:09:21 2020 +0200
gnu: cogl: Fix build with Mesa 20.
* gnu/packages/gnome.scm (cogl)[arguments]: Add phase to adjust header
includes.
---
gnu/packages/gnome.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 938efbc..e0e1ed1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4486,6 +4486,17 @@ throughout GNOME for API documentation).")
"/lib/libGL.so"))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-build-with-mesa-20
+ (lambda _
+ ;; Work around a problem with Mesa 20 where some macros used by
+ ;; Cogl went missing from eglext.h. This can likely be removed
+ ;; for newer versions of Cogl or Mesa.
+ ;; https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/19
+ (substitute* '("configure"
+ "cogl/winsys/cogl-winsys-egl-kms.c")
+ (("#include <EGL/eglext.h>" all)
+ (string-append all "\n#include <EGL/eglmesaext.h>\n")))
+ #t))
(add-before 'check 'start-xorg-server
(lambda* (#:key tests? inputs #:allow-other-keys)
(if tests?
