SHA256
1
0
forked from pool/Mesa

Accepting request 335001 from home:jirislaby:branches:X11:XOrg

update upstream status

OBS-URL: https://build.opensuse.org/request/show/335001
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=475
This commit is contained in:
Stefan Dirsch 2015-09-30 13:48:33 +00:00 committed by Git OBS Bridge
parent 769a43d2d9
commit d84ff34478
3 changed files with 16 additions and 7 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 30 09:29:30 UTC 2015 - jslaby@suse.com
- update upstream status:
* remove n_i965-Remove-early-release-of-DRI2-miptree.patch
* add U_i965-Remove-early-release-of-DRI2-miptree.patch
-------------------------------------------------------------------
Sat Sep 26 20:06:50 UTC 2015 - mpluskal@suse.com

View File

@ -52,9 +52,8 @@ Source6: %{name}-rpmlintrc
Source7: Mesa.keyring
# required for building against wayland of openSUSE 13.1
Patch0: n_Fixed-build-against-wayland-1.2.1.patch
# should be replaced by real patch in X+Mesa+Intel ddx
# this is only a workaround
Patch1: n_i965-Remove-early-release-of-DRI2-miptree.patch
# merged, should be in the next release
Patch10: U_i965-Remove-early-release-of-DRI2-miptree.patch
# to be upstreamed
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
# Patch from Fedora, fix 16bpp in llvmpipe
@ -521,7 +520,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
# required for building against wayland of openSUSE 13.1
%patch0 -p1
%endif
%patch1 -p1
%patch10 -p1
### disabled, but not dropped yet; these still need investigation in
### order to figure out whether the issue is still reproducable and
### hence a fix is required

View File

@ -1,6 +1,6 @@
From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
From 70e91d61fde239e8ae58148cacd4ff891126e2aa Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 10 Jul 2015 10:41:35 +0100
Date: Fri, 7 Aug 2015 21:13:12 +0100
Subject: i965: Remove early release of DRI2 miptree
References: bfo#86281 bko#349519
@ -13,6 +13,9 @@ 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>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86281
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
Reviewed-by: Chad Versace <chad.versace@intel.com>
---
src/mesa/drivers/dri/i965/brw_context.c | 1 -
@ -20,7 +23,7 @@ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -1417,7 +1417,6 @@ intel_process_dri2_buffer(struct brw_con
@@ -1412,7 +1412,6 @@ intel_process_dri2_buffer(struct brw_con
buffer->cpp, buffer->pitch);
}