From d451ba83e63c8e9a73a4301d7a553e4e6bf22a85 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Sep 2015 15:49:59 +0200 Subject: [PATCH] mesa: update to mesa-10.6.8 Signed-off-by: Stephan Raue --- packages/graphics/mesa/package.mk | 2 +- .../patches/mesa-10.6.7-revert-4f531da.patch | 24 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 packages/graphics/mesa/patches/mesa-10.6.7-revert-4f531da.patch diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 84fb9866e1..9077c680f9 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="mesa" -PKG_VERSION="10.6.7" +PKG_VERSION="10.6.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/graphics/mesa/patches/mesa-10.6.7-revert-4f531da.patch b/packages/graphics/mesa/patches/mesa-10.6.7-revert-4f531da.patch deleted file mode 100644 index 6281c8735c..0000000000 --- a/packages/graphics/mesa/patches/mesa-10.6.7-revert-4f531da.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur mesa-10.6.7/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c mesa-10.6.7.patch/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c ---- mesa-10.6.7/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c 2015-09-10 19:40:31.000000000 +0200 -+++ mesa-10.6.7.patch/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c 2015-09-12 19:51:13.946585268 +0200 -@@ -414,6 +414,12 @@ - GLenum target; - - _mesa_meta_fb_tex_blit_begin(ctx, &blit); -+ /* XXX: Pretend to support stencil textures so _mesa_base_tex_format() -+ * returns a valid format. When we properly support the extension, we -+ * should remove this. -+ */ -+ assert(ctx->Extensions.ARB_texture_stencil8 == false); -+ ctx->Extensions.ARB_texture_stencil8 = true; - - _mesa_GenFramebuffers(1, &fbo); - /* Force the surface to be configured for level zero. */ -@@ -451,6 +457,7 @@ - _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); - - error: -+ ctx->Extensions.ARB_texture_stencil8 = false; - _mesa_meta_fb_tex_blit_end(ctx, target, &blit); - _mesa_meta_end(ctx); -