[arch-commits] Commit in mesa/trunk (2 files)

[Laurent Carlier]

    Date: Thursday, January 9, 2014 @ 21:33:34
  Author: lcarlier
Revision: 203399

upgpkg: mesa 10.0.2-1

upstream update 10.0.2

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/revert.remove.GLXContextID.typedef.patch

------------------------------------------+
 PKGBUILD                                 |   19 ++++--------------
 revert.remove.GLXContextID.typedef.patch |   30 -----------------------------
 2 files changed, 5 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-09 20:24:26 UTC (rev 203398)
+++ PKGBUILD	2014-01-09 20:33:34 UTC (rev 203399)
@@ -4,8 +4,8 @@
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.0.1
-pkgrel=3
+pkgver=10.0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
@@ -12,19 +12,10 @@
 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')
+        LICENSE)
+md5sums=('8544c0ab3e438a08b5103421ea15b6d2'
+         '5c65a0fe315dd347e09b1f2826a1df5a')
 
-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-*
 

Deleted: revert.remove.GLXContextID.typedef.patch
===================================================================
--- revert.remove.GLXContextID.typedef.patch	2014-01-09 20:24:26 UTC (rev 203398)
+++ revert.remove.GLXContextID.typedef.patch	2014-01-09 20:33:34 UTC (rev 203399)
@@ -1,30 +0,0 @@
-From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001
-From: Kenneth Graunke <kenneth at 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 at 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
-