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 href='/guix/log/gnu/packages/security-token.scm'>logtreecommitdiff
path: root/gnu/packages/security-token.scm
AgeCommit message (Expand)Author
2023-09-10gnu: eid-mw: Update to 5.1.11....* gnu/packages/security-token.scm (eid-mw): Update to 5.1.11. Tobias Geerinckx-Rice
2023-08-29gnu: ccid: Update to 1.5.2....* gnu/packages/security-token.scm (ccid): Update to 1.5.2. Signed-off-by: Christopher Baines <mail@cbaines.net> Arjan Adriaanse
2023-08-10gnu: Add yubikey-manager-qt....* gnu/packages/security-token.scm (yubikey-manager-qt): New variable. Reviewed-by: Andreas Enge <andreas@enge.fr> Maxim Cournoyer
2023-07-18gnu: yubico-piv-tool: Use texlive-updmap.cfg in native inputs....* gnu/packages/security-token.scm (yubico-piv-tool)[native-inputs]: Replace TEXLIVE-BIN with TEXLIVE-UPDMAP.CFG. Re-order inputs alphabetically. Nicolas Goaziou
2023-07-14gnu: python-yubikey-manager: Update to 5.1.1....* gnu/packages/security-tokens.scm (python-yubikey-manager): Update to 5.1.1. [source]: Update url. [build-system]: Switch to pyproject-build-system. [arguments]: Delete. [propagated-inputs]: Remove python-six. Add python-keyring. Reorder alphabetically. [native-inputs]: Remove python-mock. Add python-makefun, python-poetry-code and python-pytest. Reorder alphabetically. Co-authored-by: John Kehayias <john.kehayias@protonmail.com> John Kehayias
2023-07-14gnu: python-fido2: Update to 1.1.1....* gnu/packages/security-tokens.scm (python-fido2): Update to 1.1.1. [build-system]: Switch to pyproject-build-system. [arguments]: Enable tests. Use gexps in phases. [propagated-inputs]: Remove python-six. Add python-pyscard. [native-inputs]: Remove python-mock and python-pyfakefs. Add python-poetry-core and python-pytest. Signed-off-by: John Kehayias <john.kehayias@protonmail.com> John Kehayias
2023-07-14gnu: python-pyscard: Update to 2.0.7....* gnu/packages/security-token.scm (python-pyscard): Update to 2.0.7. [arguments]{phases}: Use search-input-directory. Remove trailing #t. Signed-off-by: John Kehayias <john.kehayias@protonmail.com> John Kehayias
2023-06-02gnu: Add pcsc-cyberjack....* gnu/packages/security-token.scm (pcsc-cyberjack): New variable. Signed-off-by: 宋文武 <iyzsong@member.fsf.org> Arvid Krein