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

[Laurent Carlier]

    Date: Sunday, April 13, 2014 @ 16:05:20
  Author: lcarlier
Revision: 210290

upgpkg: mesa 10.1.0-5

add workaround for FS#39803

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-13 13:13:04 UTC (rev 210289)
+++ PKGBUILD	2014-04-13 14:05:20 UTC (rev 210290)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=10.1.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
@@ -12,10 +12,19 @@
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/10.1/MesaLib-${pkgver}.tar.bz2
-        LICENSE)
+        LICENSE
+        workaround-for-robustness-and-reset-with-intel.patch)
 md5sums=('3ec43f79dbcd9aa2a4a27bf1f51655b6'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+         '5c65a0fe315dd347e09b1f2826a1df5a'
+         'b6b744a948b0de9cd14a2a971b7472de')
 
+prepare () {
+  cd ${srcdir}/?esa-*
+
+  # workaround for FS#39803 - https://bugs.freedesktop.org/show_bug.cgi?id=75723
+  patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch
+}
+
 build() {
   cd ${srcdir}/?esa-*
 

Added: workaround-for-robustness-and-reset-with-intel.patch
===================================================================
--- workaround-for-robustness-and-reset-with-intel.patch	                        (rev 0)
+++ workaround-for-robustness-and-reset-with-intel.patch	2014-04-13 14:05:20 UTC (rev 210290)
@@ -0,0 +1,15 @@
+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;
+
+