HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| c447eb4d TGR |
1 | Fixes compilation with Mesa >= 18.2.5. |
| 2 | ||
| 3 | Taken from upstream: | |
| 4 | ||
| 5 | https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47 | |
| 6 | ||
| 7 | diff --git a/include/allegro5/allegro_opengl.h b/include/allegro5/allegro_opengl.h | |
| 8 | index 0f86a6768..652dd024e 100644 | |
| 9 | --- a/include/allegro5/allegro_opengl.h | |
| 10 | +++ b/include/allegro5/allegro_opengl.h | |
| 11 | @@ -103,10 +103,14 @@ | |
| 12 | ||
| 13 | /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ | |
| 14 | #define __glext_h_ | |
| 15 | +#define __gl_glext_h_ | |
| 16 | #define __glxext_h_ | |
| 17 | +#define __glx_glxext_h_ | |
| 18 | #include <GL/gl.h> | |
| 19 | #undef __glext_h_ | |
| 20 | +#undef __gl_glext_h_ | |
| 21 | #undef __glxext_h_ | |
| 22 | +#undef __glx_glxext_h_ | |
| 23 | ||
| 24 | #endif /* ALLEGRO_MACOSX */ | |
| 25 | ||
| 26 | diff --git a/include/allegro5/opengl/GLext/glx_ext_defs.h b/include/allegro5/opengl/GLext/glx_ext_defs.h | |
| 27 | index 49c502091..fba8aea5d 100644 | |
| 28 | --- a/include/allegro5/opengl/GLext/glx_ext_defs.h | |
| 29 | +++ b/include/allegro5/opengl/GLext/glx_ext_defs.h | |
| 30 | @@ -1,7 +1,9 @@ | |
| 31 | /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ | |
| 32 | #define __glxext_h_ | |
| 33 | +#define __glx_glxext_h_ | |
| 34 | #include <GL/glx.h> | |
| 35 | #undef __glxext_h_ | |
| 36 | +#undef __glx_glxext_h_ | |
| 37 | ||
| 38 | #ifndef GLX_VERSION_1_3 | |
| 39 | #define _ALLEGRO_GLX_VERSION_1_3 | |
| 40 | -- | |
| 41 | 2.20.0 |