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 #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 #undef __glxext_h_ +#undef __glx_glxext_h_ #ifndef GLX_VERSION_1_3 #define _ALLEGRO_GLX_VERSION_1_3 -- 2.20.0 76478d9'>refslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-09build-system: Add 'channel-build-system'.Ludovic Courtès
* gnu/ci.scm (channel-build-system, channel-source->package): Remove. * gnu/packages/package-management.scm (channel-source->package): New procedure, moved from (gnu ci). * guix/build-system/channel.scm: New file, with code moved from (gnu ci). * doc/guix.texi (Build Systems): Document it.
2022-07-10monads: Add 'mparameterize'.Ludovic Courtès
* etc/system-tests.scm (mparameterize): Move to... * guix/monads.scm (mparameterize): ... here. * tests/monads.scm ("mparameterize"): New test. * .dir-locals.el (c-mode): Add it.
2022-04-11tests: System tests really parameterize 'current-guix-package'.Ludovic Courtès
Until now, 'current-guix-package' was parameterized in the wrong context. Thus, 'current-guix' would end up building a variant of the 'guix' package instead of the package returned by 'channel-source->package', which is much less expensive to build. * etc/system-tests.scm (mparameterize): New macro. (tests-for-current-guix): Change the 'value' field of each <system-test> record to parameterize 'current-guix-package' for good.