diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-12 22:00:52 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-12 22:00:52 +0100 |
| commit | 12878d12acccf83ef3258a53a01f851088f0aa9e (patch) | |
| tree | 47f875b50bd7714251256475317e96f4e6d73f55 /gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch | |
| parent | 17c3e0d85d9c1a6b4c09d09dd9238297b6165a2f (diff) | |
| parent | 7b046b1bdc0b1cbc50428d4e08136a110f0a12af (diff) | |
| download | guix-12878d12acccf83ef3258a53a01f851088f0aa9e.tar.gz guix-12878d12acccf83ef3258a53a01f851088f0aa9e.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch')
| -rw-r--r-- | gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch | 41 |
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 |