From 5ae09077676f5001b2bb26dc6ced548b30821197 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 23 Mar 2014 12:08:19 +0100 Subject: [PATCH] MesaLib: apply patch from http://patchwork.freedesktop.org/patch/18053/ to workaround vmwgfx assertion. --- ...-svga-replace-an-assertion-with-warning.patch | 16 ++++++++++++++++ srcpkgs/MesaLib/template | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/MesaLib/patches/Mesa-dev-1-2-svga-replace-an-assertion-with-warning.patch diff --git a/srcpkgs/MesaLib/patches/Mesa-dev-1-2-svga-replace-an-assertion-with-warning.patch b/srcpkgs/MesaLib/patches/Mesa-dev-1-2-svga-replace-an-assertion-with-warning.patch new file mode 100644 index 00000000000..caf53f6bf50 --- /dev/null +++ b/srcpkgs/MesaLib/patches/Mesa-dev-1-2-svga-replace-an-assertion-with-warning.patch @@ -0,0 +1,16 @@ +See http://patchwork.freedesktop.org/patch/18053/ + +--- src/gallium/drivers/svga/svga_resource_texture.c ++++ src/gallium/drivers/svga/svga_resource_texture.c +@@ -205,7 +205,10 @@ svga_texture_get_handle(struct pipe_screen *screen, + struct svga_winsys_screen *sws = svga_winsys_screen(texture->screen); + unsigned stride; + +- assert(svga_texture(texture)->key.cachable == 0); ++ if (svga_texture(texture)->key.cachable) { ++ debug_warn_once("svga: texture->key.cachable=1"); ++ } ++ + svga_texture(texture)->key.cachable = 0; + stride = util_format_get_nblocksx(texture->format, texture->width0) * + util_format_get_blocksize(texture->format); diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index 154be1bb767..ab53feb8ba8 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -1,7 +1,7 @@ # Template build file for 'MesaLib'. pkgname=MesaLib version=10.1.0 -revision=4 +revision=5 wrksrc="Mesa-${version}" build_style=gnu-configure configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm