From a4883794eda094aac958d606ba82316b193ed95e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Feb 16 2019 23:28:59 +0000 Subject: Fix FTBFS (rhbz#1674575) --- diff --git a/allegro-4.4.2-ftbfs.patch b/allegro-4.4.2-ftbfs.patch new file mode 100644 index 0000000..093df69 --- /dev/null +++ b/allegro-4.4.2-ftbfs.patch @@ -0,0 +1,39 @@ +diff -up allegro-4.4.2/addons/allegrogl/include/alleggl.h~ allegro-4.4.2/addons/allegrogl/include/alleggl.h +--- allegro-4.4.2/addons/allegrogl/include/alleggl.h~ 2019-02-17 00:22:14.000000000 +0100 ++++ allegro-4.4.2/addons/allegrogl/include/alleggl.h 2019-02-17 00:23:57.342718525 +0100 +@@ -60,12 +60,9 @@ typedef __int64 INT64; + + #else /* ALLEGRO_MACOSX */ + +-/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ +-#define __glext_h_ +-#define __glxext_h_ ++#define GL_GLEXT_PROTOTYPES ++#define GLX_GLXEXT_PROTOTYPES + #include +-#undef __glext_h_ +-#undef __glxext_h_ + + #endif /* ALLEGRO_MACOSX */ + +diff -up allegro-4.4.2/addons/allegrogl/src/x.c~ allegro-4.4.2/addons/allegrogl/src/x.c +--- allegro-4.4.2/addons/allegrogl/src/x.c~ 2009-10-17 09:05:52.000000000 +0200 ++++ allegro-4.4.2/addons/allegrogl/src/x.c 2019-02-17 00:23:20.470661820 +0100 +@@ -650,7 +650,7 @@ static int decode_fbconfig (GLXFBConfig + return -1; + } + +- if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT)) { ++ if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT_ARB)) { + TRACE(PREFIX_I "decode_fbconfig: Not RGBA mode\n"); + return -1; + } +@@ -674,7 +674,7 @@ static int decode_fbconfig (GLXFBConfig + /* Floating-point depth is not supported as glx extension (yet). */ + i->float_depth = 0; + +- i->float_color = (render_type & GLX_RGBA_FLOAT_BIT); ++ i->float_color = (render_type & GLX_RGBA_FLOAT_BIT_ARB); + + v = glXGetVisualFromFBConfig(_xwin.display, fbc); + if (!v) { diff --git a/allegro.spec b/allegro.spec index 8a6c5d2..74b022f 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -36,6 +36,8 @@ Patch10: allegro-4.4.2-keybgrab-fix.patch Patch11: allegro-4.4.2-Werror-format-security.patch # PPC builds fail when we define aliases for fadd / fdiv / fmull Patch12: allegro-4.4.2-no-fix-aliases.patch +# Fix build errors with modern GL headers +Patch13: allegro-4.4.2-ftbfs.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: texinfo cmake @@ -384,6 +386,9 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %changelog +* Sat Feb 16 2019 Hans de Goede - 4.4.2-23 +- Fix FTBFS (rhbz#1674575) + * Thu Jan 31 2019 Fedora Release Engineering - 4.4.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild