diff options
Diffstat (limited to 'libre-multilib')
| -rw-r--r-- | libre-multilib/lib32-mesa-libcl/0001-i965-Remove-early-release-of-DRI2-miptree.patch | 33 | ||||
| -rw-r--r-- | libre-multilib/lib32-mesa-libcl/PKGBUILD | 17 |
2 files changed, 46 insertions, 4 deletions
diff --git a/libre-multilib/lib32-mesa-libcl/0001-i965-Remove-early-release-of-DRI2-miptree.patch b/libre-multilib/lib32-mesa-libcl/0001-i965-Remove-early-release-of-DRI2-miptree.patch new file mode 100644 index 000000000..2cd33eedd --- /dev/null +++ b/libre-multilib/lib32-mesa-libcl/0001-i965-Remove-early-release-of-DRI2-miptree.patch @@ -0,0 +1,33 @@ +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-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD index 71d2b9a54..3946dd7f6 100644 --- a/libre-multilib/lib32-mesa-libcl/PKGBUILD +++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa _pkgname=libcl pkgname=lib32-$pkgbase-$_pkgname -pkgver=10.6.3 +pkgver=10.6.4 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library and ICD loader (32-bit)' arch=('x86_64') @@ -17,11 +17,20 @@ makedepends=('python2-mako' 'dri2proto' 'dri3proto' 'glproto' 'presentproto' 'py provides=("lib32-$_pkgname" 'lib32-opencl-icd-loader') conflicts=("lib32-$_pkgname" "lib32-$_pkgname-libre" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx' 'lib32-ocl-icd') replaces=("lib32-$_pkgname" "lib32-$_pkgname-libre" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx') -source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig}) -sha512sums=('4474e089c0b618d0b0469e31c213d84530f9dd22d4280612f34370578a7e7dfdfd1ac499feae470f032e462f5d7532aafa4416a7dd97d0cd6d9332aec5b44446' - 'SKIP') +source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig} + 0001-i965-Remove-early-release-of-DRI2-miptree.patch) +sha512sums=('913800ebb73bde04ceed1dfe0c622f36622a89be2a795b63e6b05fbb59a982f4b0d83531b2b1697aeb20bab0aac4b82adf8e7d1985713e525d722b3b7b58f683' + 'SKIP' + '86bfab88131440d1e5aefd157f12d8927c1a71af4f29b43c607bd2c37ee87f8164c92dc4309fade3c667f7d5907f99d0aa79b5fee1b8ff0eafe5f6d869bbed99') 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 +} + build() { cd $srcdir/$pkgbase-$pkgver |