rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

- Mesa.spec: Disable Nouveau locking patches by default

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=542
This commit is contained in:
Max Staudt 2016-10-17 12:55:00 +00:00 committed by Git OBS Bridge
parent 6cd013da6f
commit fbdc8ab182
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mesa.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 17 12:34:12 UTC 2016 - mstaudt@suse.com
- Mesa.spec: Disable Nouveau locking patches by default
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 14 10:17:17 UTC 2016 - mstaudt@suse.com Fri Oct 14 10:17:17 UTC 2016 - mstaudt@suse.com

10
Mesa.spec
View File

@ -16,6 +16,10 @@
# #
# Only enable the Nouveau locking patches if you know what you're doing.
# They may fix KDE on Nouveau. They may also deadlock your userland.
%define use_broken_nouveau_locking_patches 0
%define glamor 1 %define glamor 1
%define _name_archive mesa %define _name_archive mesa
%define _version 12.0.3 %define _version 12.0.3
@ -73,12 +77,15 @@ Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch
# Already upstream # Already upstream
Patch22: U_r300g-Set-R300_VAP_CNTL-on-RSxxx-to-avoid-triangle-flickering.patch Patch22: U_r300g-Set-R300_VAP_CNTL-on-RSxxx-to-avoid-triangle-flickering.patch
# Nouveau multithreading workarounds from https://github.com/imirkin/mesa/commits/locking # Nouveau multithreading workarounds from https://github.com/imirkin/mesa/commits/locking
%if %{use_broken_nouveau_locking_patches}
Patch61: N_01-WIP-nouveau-add-locking.patch Patch61: N_01-WIP-nouveau-add-locking.patch
Patch62: N_02-nouveau-more-locking-make-sure-that-fence-work-is-always-done-with-the-push-mutex-acquired.patch Patch62: N_02-nouveau-more-locking-make-sure-that-fence-work-is-always-done-with-the-push-mutex-acquired.patch
Patch63: N_03-nv30-locking-fixes.patch Patch63: N_03-nv30-locking-fixes.patch
Patch64: N_04-nv50-Fix-double-lock-in-nv50_hw_sm_get_query_result.patch Patch64: N_04-nv50-Fix-double-lock-in-nv50_hw_sm_get_query_result.patch
Patch65: N_05-Use-nv50_render_condition-in-nv50_blitctx_post_blit.patch Patch65: N_05-Use-nv50_render_condition-in-nv50_blitctx_post_blit.patch
%endif
BuildRequires: autoconf >= 2.60 BuildRequires: autoconf >= 2.60
BuildRequires: automake BuildRequires: automake
@ -592,11 +599,14 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch18 -p1 %patch18 -p1
%patch21 -p1 %patch21 -p1
%patch22 -p1 %patch22 -p1
%if %{use_broken_nouveau_locking_patches}
%patch61 -p1 %patch61 -p1
%patch62 -p1 %patch62 -p1
%patch63 -p1 %patch63 -p1
%patch64 -p1 %patch64 -p1
%patch65 -p1 %patch65 -p1
%endif
%build %build
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310