[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: |
Mon, 25 May 2020 15:15:26 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 460f1140a0a28cd93eb1eca6c75241961b4c0391
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?
- 17/63: gnu: python-pycairo: Update to 1.19.1., (continued)
- 17/63: gnu: python-pycairo: Update to 1.19.1., guix-commits, 2020/05/25
- 30/63: gnu: json-c: Update to 0.14., guix-commits, 2020/05/25
- 31/63: gnu: python-jinja2: Update to 2.11.2., guix-commits, 2020/05/25
- 19/63: gnu: python-certifi: Update to 2020.4.5.1., guix-commits, 2020/05/25
- 24/63: gnu: python-cython: Update to 0.29.17., guix-commits, 2020/05/25
- 25/63: gnu: python-pycparser: Update to 2.20., guix-commits, 2020/05/25
- 27/63: gnu: python-mako: Update to 1.1.2., guix-commits, 2020/05/25
- 28/63: gnu: NSS: Update to 3.52., guix-commits, 2020/05/25
- 32/63: gnu: KDE Frameworks: Update to 5.70., guix-commits, 2020/05/25
- 35/63: gnu: NSS: Update to 3.52.1 [fixes CVE-2020-12399]., guix-commits, 2020/05/25
- 37/63: gnu: cogl: Fix build with Mesa 20.,
guix-commits <=
- 40/63: gnu: spirv-tools: Update to 2020.2., guix-commits, 2020/05/25
- 41/63: gnu: spirv-tools: Do not build static libraries., guix-commits, 2020/05/25
- 42/63: gnu: glslang: Update to 8.13.3743., guix-commits, 2020/05/25
- 26/63: gnu: python-idna: Update to 2.9., guix-commits, 2020/05/25
- 46/63: gnu: vulkan-loader: Enable tests., guix-commits, 2020/05/25
- 58/63: gnu: mtxclient: Update to 0.3.0., guix-commits, 2020/05/25
- 59/63: gnu: nheko: Update to 0.7.1., guix-commits, 2020/05/25
- 63/63: Merge branch 'master' into staging, guix-commits, 2020/05/25
- 33/63: gnu: Qt: Update to 5.14.2., guix-commits, 2020/05/25
- 38/63: gnu: gstreamer: Increase test timeouts., guix-commits, 2020/05/25