From a5c705a0fd47d7f35eb37c725177232104586860 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 27 Jan 2019 03:09:46 +0100 Subject: [PATCH] allegro5: fix FTBFS with newer mesa --- srcpkgs/allegro4/template | 2 +- .../fix_building_with_newer_mesa.patch | 29 +++++++++++++++++++ srcpkgs/allegro5/template | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/allegro5/patches/fix_building_with_newer_mesa.patch diff --git a/srcpkgs/allegro4/template b/srcpkgs/allegro4/template index 3b3e33d2f21..146d0c52555 100644 --- a/srcpkgs/allegro4/template +++ b/srcpkgs/allegro4/template @@ -1,4 +1,4 @@ -# Template file for 'allegro4'. +# Template file for 'allegro4' pkgname=allegro4 version=4.4.2 revision=6 diff --git a/srcpkgs/allegro5/patches/fix_building_with_newer_mesa.patch b/srcpkgs/allegro5/patches/fix_building_with_newer_mesa.patch new file mode 100644 index 00000000000..1dc22ef68c3 --- /dev/null +++ b/srcpkgs/allegro5/patches/fix_building_with_newer_mesa.patch @@ -0,0 +1,29 @@ +--- include/allegro5/allegro_opengl.h ++++ 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 */ + +--- include/allegro5/opengl/GLext/glx_ext_defs.h ++++ 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 diff --git a/srcpkgs/allegro5/template b/srcpkgs/allegro5/template index a1e58f4641c..d8448d2d436 100644 --- a/srcpkgs/allegro5/template +++ b/srcpkgs/allegro5/template @@ -1,4 +1,4 @@ -# Template file for 'allegro5'. +# Template file for 'allegro5' pkgname=allegro5 version=5.2.3.0 revision=1