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

[Laurent Carlier]

    Date: Tuesday, May 6, 2014 @ 10:34:48
  Author: lcarlier
Revision: 212067

upgpkg: mesa 10.1.2-1

upstream update 10.1.2

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/workaround-for-robustness-and-reset-with-intel.patch

------------------------------------------------------+
 PKGBUILD                                             |   19 ++++-------------
 workaround-for-robustness-and-reset-with-intel.patch |   15 -------------
 2 files changed, 5 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-06 08:29:13 UTC (rev 212066)
+++ PKGBUILD	2014-05-06 08:34:48 UTC (rev 212067)
@@ -4,8 +4,8 @@
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.1.1
-pkgrel=2
+pkgver=10.1.2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' '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
-        workaround-for-robustness-and-reset-with-intel.patch)
-md5sums=('1fde7ed079df7aeb9b6a744ca033de8d'
-         '5c65a0fe315dd347e09b1f2826a1df5a'
-         'b6b744a948b0de9cd14a2a971b7472de')
+        LICENSE)
+md5sums=('28b60d15ac9f364da1e0155911eaf44e'
+         '5c65a0fe315dd347e09b1f2826a1df5a')
 
-prepare () {
-  cd ${srcdir}/?esa-*
-
-  # workaround for FS#39803 - Merged upstream for mesa 10.1.2/10.2
-  patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch
-}
-
 build() {
   cd ${srcdir}/?esa-*
 

Deleted: workaround-for-robustness-and-reset-with-intel.patch
===================================================================
--- workaround-for-robustness-and-reset-with-intel.patch	2014-05-06 08:29:13 UTC (rev 212066)
+++ workaround-for-robustness-and-reset-with-intel.patch	2014-05-06 08:34:48 UTC (rev 212067)
@@ -1,15 +0,0 @@
-diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
-index e113654..5790680 100644
---- a/src/mesa/drivers/dri/i965/brw_context.c
-+++ b/src/mesa/drivers/dri/i965/brw_context.c
-@@ -645,7 +645,7 @@ brwCreateContext(gl_api api,
- 
-    brw_init_driver_functions(brw, &functions);
- 
--   if (notify_reset)
-+   if (notify_reset && brw->gen >= 6)
-       functions.GetGraphicsResetStatus = brw_get_graphics_reset_status;
- 
-    struct gl_context *ctx = &brw->ctx;
-
-