mesa-libcl-11.0.4-1: updating version

2 files changed, 4 insertions, 42 deletions

diff --git a/libre/mesa-libcl/0001-i965-Remove-early-release-of-DRI2-miptree.patch b/libre/mesa-libcl/0001-i965-Remove-early-release-of-DRI2-miptree.patch
deleted file mode 100644
index 2cd33eedd..000000000
--- a/libre/mesa-libcl/0001-i965-Remove-early-release-of-DRI2-miptree.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 10 Jul 2015 10:41:35 +0100
-Subject: [PATCH] i965: Remove early release of DRI2 miptree
-
-intel_update_winsys_renderbuffer_miptree() will release the existing
-miptree when wrapping a new DRI2 buffer, so we can remove the early
-release and so prevent a NULL mt dereference should importing the new
-DRI2 name fail for any reason. (Reusing the old DRI2 name will result
-in the rendering going astray, to a stale buffer, and not shown on the
-screen, but it allows us to issue a warning and not crash much later in
-innocent code.)
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
- src/mesa/drivers/dri/i965/brw_context.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
-index e8d1396..72f3897 100644
---- a/src/mesa/drivers/dri/i965/brw_context.c
-+++ b/src/mesa/drivers/dri/i965/brw_context.c
-@@ -1388,7 +1388,6 @@ intel_process_dri2_buffer(struct brw_context *brw,
-               buffer->cpp, buffer->pitch);
-    }
- 
--   intel_miptree_release(&rb->mt);
-    bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
-                                           buffer->name);
-    if (!bo) {
--- 
-2.5.0
-
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 1b2cdacd3..93791a9bd 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=mesa
 _pkgname=libcl
 pkgname=$pkgbase-$_pkgname
-pkgver=11.0.3
+pkgver=11.0.4
 pkgrel=1
 pkgdesc='Mesa 3-D OpenCL library and ICD loader'
 arch=('i686' 'x86_64')
@@ -17,19 +17,14 @@ makedepends=('python2-mako' 'dri2proto' 'dri3proto' 'glproto' 'presentproto' 'py
 provides=("$_pkgname" 'opencl-icd-loader')
 conflicts=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx' 'ocl-icd')
 replaces=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx')
-source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig}
-        0001-i965-Remove-early-release-of-DRI2-miptree.patch)
-sha512sums=('7cec13749a600e589794c4b7c082bcbe47d708d3e4a670160a09b07a0c5afc301b984ac4e26519ed3acda6171f936f700eb62c0977cc392343822603ff6c7c15'
-            'SKIP'
-            '86bfab88131440d1e5aefd157f12d8927c1a71af4f29b43c607bd2c37ee87f8164c92dc4309fade3c667f7d5907f99d0aa79b5fee1b8ff0eafe5f6d869bbed99')
+source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig})
+sha512sums=('1647ba750b6d8860d8a87aee5444c3aa4d7c916e38a699056d0b4e453651378728a875d6781598dbba7efa96f9c14f1fe6ef615aaa0ce80d02d86116d7331f14'
+            'SKIP')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
 
 prepare() {
   cd $srcdir/$pkgbase-$pkgver
 
-  # Should fix FS#45750, tested by heftig - Not merged upstream
-  patch -Np1 -i ../0001-i965-Remove-early-release-of-DRI2-miptree.patch
-
   # Fix detection of libLLVM when built with CMake
   sed -i 's/LLVM_SO_NAME=.*/LLVM_SO_NAME=LLVM/' configure
 }