From 2f89ca973ddbecef479e22670310f744e992d3eb Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 6 Jan 2014 13:37:13 +0000
Subject: [PATCH] extra/mesa to 10.0.1-2

---
 extra/mesa/PKGBUILD                           | 15 ++++++++--
 .../revert.remove.GLXContextID.typedef.patch  | 30 +++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 extra/mesa/revert.remove.GLXContextID.typedef.patch

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 631f1b62b..17bd795fe 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -10,7 +10,7 @@
 pkgbase=mesa
 pkgname=('mesa' 'mesa-libgl')
 pkgver=10.0.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
@@ -18,9 +18,18 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-        LICENSE)
+        LICENSE
+        revert.remove.GLXContextID.typedef.patch)
 md5sums=('0a72ca5b36046a658bf6038326ff32ed'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+         '5c65a0fe315dd347e09b1f2826a1df5a'
+         '6e49b4dd4ceb7873610f608f74efbaaf')
+
+prepare() {
+  cd ${srcdir}/?esa-*
+
+  # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392)
+  patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch
+}
 
 build() {
   cd ${srcdir}/?esa-*
diff --git a/extra/mesa/revert.remove.GLXContextID.typedef.patch b/extra/mesa/revert.remove.GLXContextID.typedef.patch
new file mode 100644
index 000000000..92232dd2d
--- /dev/null
+++ b/extra/mesa/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
+