[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/63: gnu: cogl: Fix build with Mesa 20.
From: |
guix-commits |
Subject: |
37/63: gnu: cogl: Fix build with Mesa 20. |
Date: |
Tue, 26 May 2020 17:18:10 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 0c8a51c7d28befa49e596421de22c0b4fef100f0
Author: Marius Bakke <address@hidden>
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?
- 21/63: gnu: python-pyopenssl: Update to 19.1.0., (continued)
- 21/63: gnu: python-pyopenssl: Update to 19.1.0., guix-commits, 2020/05/26
- 23/63: gnu: python-requests: Update to 2.23.0., guix-commits, 2020/05/26
- 08/63: gnu: qpdf: Update to 10.0.1., guix-commits, 2020/05/26
- 07/63: gnu: ImageMagick: Update to 6.9.11-11., guix-commits, 2020/05/26
- 10/63: gnu: libva: Update to 2.7.1., guix-commits, 2020/05/26
- 19/63: gnu: python-certifi: Update to 2020.4.5.1., guix-commits, 2020/05/26
- 17/63: gnu: python-pycairo: Update to 1.19.1., guix-commits, 2020/05/26
- 24/63: gnu: python-cython: Update to 0.29.17., guix-commits, 2020/05/26
- 25/63: gnu: python-pycparser: Update to 2.20., guix-commits, 2020/05/26
- 29/63: gnu: pcre2: Update to 10.35., guix-commits, 2020/05/26
- 37/63: gnu: cogl: Fix build with Mesa 20.,
guix-commits <=
- 38/63: gnu: gstreamer: Increase test timeouts., guix-commits, 2020/05/26
- 43/63: gnu: glslang: Build shared libraries., guix-commits, 2020/05/26
- 39/63: gnu: spirv-headers: Update to 1.5.3., guix-commits, 2020/05/26
- 36/63: Merge branch 'master' into staging, guix-commits, 2020/05/26
- 15/63: gnu: CUPS: Update to 2.3.3., guix-commits, 2020/05/26
- 18/63: gnu: python-cffi: Update to 1.14.0., guix-commits, 2020/05/26
- 47/63: gnu: vulkan-tools: Update to 1.2.140., guix-commits, 2020/05/26
- 51/63: gnu: Mesa: Remove unused input., guix-commits, 2020/05/26
- 22/63: gnu: python-urllib3: Update to 1.25.9., guix-commits, 2020/05/26
- 31/63: gnu: python-jinja2: Update to 2.11.2., guix-commits, 2020/05/26