diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-13 03:42:46 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-13 03:42:46 +0000 |
commit | bcefa96cbc68f340b2aa11c108353993db074e76 (patch) | |
tree | 6891076b95494e90c5b7a9fd3628ea56e17588b5 /extra/mesa | |
parent | 61e090957dbc6b062f3a1af7eeb0d58478c6657d (diff) |
Mon Jan 13 03:38:11 UTC 2014
Diffstat (limited to 'extra/mesa')
-rw-r--r-- | extra/mesa/PKGBUILD | 21 | ||||
-rw-r--r-- | extra/mesa/revert.remove.GLXContextID.typedef.patch | 30 |
2 files changed, 6 insertions, 45 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 12b858267..5c6f44a14 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,29 +1,20 @@ -# $Id: PKGBUILD 203236 2014-01-06 07:56:25Z lcarlier $ +# $Id: PKGBUILD 203530 2014-01-12 20:24:08Z foutrelis $ # 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=2 +pkgver=10.0.2 +pkgrel=1 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 - revert.remove.GLXContextID.typedef.patch) -md5sums=('0a72ca5b36046a658bf6038326ff32ed' - '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 -} + LICENSE) +md5sums=('8544c0ab3e438a08b5103421ea15b6d2' + '5c65a0fe315dd347e09b1f2826a1df5a') build() { cd ${srcdir}/?esa-* diff --git a/extra/mesa/revert.remove.GLXContextID.typedef.patch b/extra/mesa/revert.remove.GLXContextID.typedef.patch deleted file mode 100644 index 92232dd2d..000000000 --- a/extra/mesa/revert.remove.GLXContextID.typedef.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - |