summaryrefslogtreecommitdiff
path: root/extra/mesa
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-05-07 04:04:41 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-05-07 04:04:41 +0000
commit2d7e9da010b34660baba072183cce7664dc8956c (patch)
tree0a9bd47a90edc63829ae06bb549c58cc4548847d /extra/mesa
parent58ee2a8b8164437294a44a627d05ee1c701ced57 (diff)
Wed May 7 04:00:53 UTC 2014
Diffstat (limited to 'extra/mesa')
-rw-r--r--extra/mesa/PKGBUILD21
-rw-r--r--extra/mesa/workaround-for-robustness-and-reset-with-intel.patch15
2 files changed, 6 insertions, 30 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 9bb5be5b8..3e949d673 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,29 +1,20 @@
-# $Id: PKGBUILD 211882 2014-04-28 15:42:49Z lcarlier $
+# $Id: PKGBUILD 212068 2014-05-06 08:35:05Z 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.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')
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')
-
-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
-}
+ LICENSE)
+md5sums=('28b60d15ac9f364da1e0155911eaf44e'
+ '5c65a0fe315dd347e09b1f2826a1df5a')
build() {
cd ${srcdir}/?esa-*
diff --git a/extra/mesa/workaround-for-robustness-and-reset-with-intel.patch b/extra/mesa/workaround-for-robustness-and-reset-with-intel.patch
deleted file mode 100644
index dc4a213bb..000000000
--- a/extra/mesa/workaround-for-robustness-and-reset-with-intel.patch
+++ /dev/null
@@ -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;
-
-