diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-01-06 14:48:00 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-01-06 14:48:00 -0200 |
commit | b55fd244d3f98bc156578f5dce0ae2870657212a (patch) | |
tree | a8cca241faaef7460578a9e602b77f41d247452e /libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch | |
parent | b87fe580cb6702a2a3f1f67b0225add0f2e613d0 (diff) |
mesa-libcl-10.0.1-2: revert GLXContextID typedef from glx.h (FS#38392 => https://bugs.archlinux.org/task/38392)
Diffstat (limited to 'libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch')
-rw-r--r-- | libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch b/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch new file mode 100644 index 000000000..92232dd2d --- /dev/null +++ b/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch @@ -0,0 +1,30 @@ +From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001 +From: Kenneth Graunke <kenneth@whitecape.org> +Date: Mon, 30 Dec 2013 07:19:36 +0000 +Subject: Revert "mesa: Remove GLXContextID typedef from glx.h." + +This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1. + +According to belak51 on IRC, this commit broke Allegro, which would no +longer compile. Applications apparently expect the GLXContextID typedef +to exist in glx.h; removing it breaks them. A bit of searching around +the internet revealed other complaints since upgrading to Mesa 10. + +Cc: "10.0" <mesa-stable@lists.freedesktop.org> +(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33) +--- +diff --git a/include/GL/glx.h b/include/GL/glx.h +index 62d0ede..234abc0 100644 +--- a/include/GL/glx.h ++++ b/include/GL/glx.h +@@ -168,6 +168,7 @@ typedef XID GLXDrawable; + /* GLX 1.3 and later */ + typedef struct __GLXFBConfigRec *GLXFBConfig; + typedef XID GLXFBConfigID; ++typedef XID GLXContextID; + typedef XID GLXWindow; + typedef XID GLXPbuffer; + +-- +cgit v0.9.0.2-2-gbebe + |