summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorRutger Helling <rhelling@mykolab.com>2018-12-12 11:04:54 +0100
committerRutger Helling <rhelling@mykolab.com>2018-12-12 11:12:01 +0100
commitab533c613ee2a44595786a6aca0b958f9f7f1dd9 (patch)
tree67212b0ec29b3354af31c8a6bcd0e50c032baf22 /gnu/packages/patches
parent95ae013092af8533e3bd315373ca0fcbb6a2d1c1 (diff)
downloadguix-ab533c613ee2a44595786a6aca0b958f9f7f1dd9.tar.gz
gnu: allegro: Fix compilation with Mesa >= 18.2.5.
* gnu/packages/game-development.scm (allegro)[source]: Add
allegro-fix-compilation-mesa-18.2.5-and-later.patch.
* gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch:
New file.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch b/gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch
new file mode 100644
index 0000000000..fa273a5dfa
--- /dev/null
+++ b/gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch
@@ -0,0 +1,41 @@
+Fixes compilation with Mesa >= 18.2.5.
+
+Taken from upstream:
+
+https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47
+
+diff --git a/include/allegro5/allegro_opengl.h b/include/allegro5/allegro_opengl.h
+index 0f86a6768..652dd024e 100644
+--- a/include/allegro5/allegro_opengl.h
++++ b/include/allegro5/allegro_opengl.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/include/allegro5/opengl/GLext/glx_ext_defs.h b/include/allegro5/opengl/GLext/glx_ext_defs.h
+index 49c502091..fba8aea5d 100644
+--- a/include/allegro5/opengl/GLext/glx_ext_defs.h
++++ b/include/allegro5/opengl/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