01/02: gnu: address@hidden: Fix building with newer mesa.

[guix-commits]

efraim pushed a commit to branch staging
in repository guix.

commit d5c60e0aff8c71d66e598e2c7787a9f7c875fd0c
Author: Efraim Flashner <address@hidden>
Date:   Tue Jan 1 10:20:18 2019 +0200

    gnu: address@hidden: Fix building with newer mesa.
    
    * gnu/packages/game-development.scm (address@hidden)[source]: Add patch.
    * gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/game-development.scm                  |  4 ++-
 .../patches/allegro4-mesa-18.2.5-and-later.patch   | 41 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 050d174..64f2bf9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -577,6 +577,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/aegisub-icu59-include-unistr.patch      \
   %D%/packages/patches/aegisub-boost68.patch                    \
   %D%/packages/patches/agg-am_c_prototype.patch                        \
+  %D%/packages/patches/allegro4-mesa-18.2.5-and-later.patch    \
   %D%/packages/patches/amule-crypto-6.patch                    \
   %D%/packages/patches/antiword-CVE-2014-8123.patch                    \
   %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch  \
diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index 8a29297..efca985 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2015, 2018 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015, 2018 Alex Kost <address@hidden>
 ;;; Copyright © 2015, 2016, 2017 David Thompson <address@hidden>
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016, 2017 Kei Kebreau <address@hidden>
 ;;; Copyright © 2016, 2018 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016, 2017, 2018 Julian Graham <address@hidden>
@@ -613,6 +613,8 @@ programming language.")
               (uri (string-append "https://github.com/liballeg/allegro5/";
                                   "releases/download/" version "/allegro-"
                                   version ".tar.gz"))
+              (patches (search-patches
+                        "allegro4-mesa-18.2.5-and-later.patch"))
               (sha256
                (base32
                 "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"))))
diff --git a/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch 
b/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch
new file mode 100644
index 0000000..a494482
--- /dev/null
+++ b/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch
@@ -0,0 +1,41 @@
+Fixes compilation with Mesa >= 18.2.5.
+
+Modified from upstream to work on allegro4:
+
+https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47
+
+diff --git a/addons/allegrogl/include/alleggl.h 
b/addons/allegrogl/include/alleggl.h
+index 0f86a6768..652dd024e 100644
+--- a/addons/allegrogl/include/alleggl.h
++++ b/addons/allegrogl/include/alleggl.h
+@@ -103,10 +103,14 @@
+
+ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
+ #define __glext_h_
++#define __gl_glext_h_
+ #define __glxext_h_
++#define __glx_glxext_h_
+ #include <GL/gl.h>
+ #undef  __glext_h_
++#undef  __gl_glext_h_
+ #undef  __glxext_h_
++#undef  __glx_glxext_h_
+
+ #endif /* ALLEGRO_MACOSX */
+
+diff --git a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h 
b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
+index 49c502091..fba8aea5d 100644
+--- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
++++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
+@@ -1,7 +1,9 @@
+ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
+ #define __glxext_h_
++#define __glx_glxext_h_
+ #include <GL/glx.h>
+ #undef __glxext_h_
++#undef __glx_glxext_h_
+
+ #ifndef GLX_VERSION_1_3
+ #define _ALLEGRO_GLX_VERSION_1_3
+--
+2.20.0