diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-07 03:30:07 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-07 03:30:07 +0000 |
| commit | bd5b8fe0fe2355ad0df744ed310d12b8a70c51f9 (patch) | |
| tree | 193748868eafd7f5d1fb754757fa956bb3070ae6 /extra/mesa | |
| parent | 3b88fa9d064e61705923ef42381b467bc8ecfd32 (diff) | |
Tue Jan 7 03:27:41 UTC 2014
Diffstat (limited to 'extra/mesa')
| -rw-r--r-- | extra/mesa/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/mesa/revert.remove.GLXContextID.typedef.patch | 30 |
2 files changed, 43 insertions, 4 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index d83c26897..12b858267 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,20 +1,29 @@ -# $Id: PKGBUILD 201668 2013-12-17 21:04:31Z lcarlier $ +# $Id: PKGBUILD 203236 2014-01-06 07:56:25Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' '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') url="http://mesa3d.sourceforge.net" license=('custom') 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 + |