From 5e4633628e91186759ea4e0af506e8928d8f45de Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 5 Jan 2014 09:12:11 +0100 Subject: [PATCH] allegro4: add patch to fix build with mesa10. --- .../allegro4/patches/mesa10-uncompat.patch | 22 +++++++++++++++++++ srcpkgs/allegro4/template | 1 + 2 files changed, 23 insertions(+) create mode 100644 srcpkgs/allegro4/patches/mesa10-uncompat.patch diff --git a/srcpkgs/allegro4/patches/mesa10-uncompat.patch b/srcpkgs/allegro4/patches/mesa10-uncompat.patch new file mode 100644 index 00000000000..ae1aa4440ef --- /dev/null +++ b/srcpkgs/allegro4/patches/mesa10-uncompat.patch @@ -0,0 +1,22 @@ +Mesa<=10.0.1 removed the GLXContextID from glx.h and it has been re-added since: + +http://cgit.freedesktop.org/mesa/mesa/commit/?id=f425d56ba41382be04366d011536ee78a03a2f33 + +For now, use the same type (XID) than GLXContextID; we can remove this patch +once mesa-10 contains the above commit. + + -- xtraeme + +--- addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h.orig 2014-01-05 09:08:26.796542194 +0100 ++++ addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h 2014-01-05 09:08:46.115682136 +0100 +@@ -59,8 +59,8 @@ AGL_API(void, DestroyGLXVideoSourceSGIX, + /* GLX_EXT_import_context */ + AGL_API(Display *, GetCurrentDisplayEXT, (void)) + AGL_API(int, QueryContextInfoEXT, (Display *, GLXContext, int, int *)) +-AGL_API(GLXContextID, GetContextIDEXT, (const GLXContext)) +-AGL_API(GLXContext, ImportContextEXT, (Display *, GLXContextID)) ++AGL_API(XID, GetContextIDEXT, (const GLXContext)) ++AGL_API(GLXContext, ImportContextEXT, (Display *, XID)) + AGL_API(void, FreeContextEXT, (Display *, GLXContext)) + #endif + diff --git a/srcpkgs/allegro4/template b/srcpkgs/allegro4/template index 3b5ab5b69a7..6c50538bc7b 100644 --- a/srcpkgs/allegro4/template +++ b/srcpkgs/allegro4/template @@ -25,5 +25,6 @@ allegro4-devel_package() { vmove usr/bin/allegro-config vmove "usr/lib/*.a" vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig } }