From d53aff40aa7fe302c91ffb5230d9826a7cd287836f86f8dc76b0a119d71119d0 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 24 May 2022 21:24:55 +0000 Subject: [PATCH 1/2] Accepting request 979041 from home:sbradnick:branches:X11:XOrg Another submission for 'n_stop-iris-flicker.patch' using 'git show' to generate .patch file. OBS-URL: https://build.opensuse.org/request/show/979041 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1110 --- Mesa.changes | 33 +++++++++++++++++++++++++++++++++ Mesa.spec | 6 +++++- n_stop-iris-flicker.patch | 20 ++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 n_stop-iris-flicker.patch diff --git a/Mesa.changes b/Mesa.changes index d922d28..8e5251c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue May 24 19:18:59 UTC 2022 - Scott Bradnick + +- Calling patch with '-p1' (as the others are) so 'git show' + .patch output works. + +------------------------------------------------------------------- +Tue May 24 18:50:21 UTC 2022 - Scott Bradnick + +- Generating 'n_stop-iris-flicker.patch' from 'git format-patch' vs. + a standard diff. + +------------------------------------------------------------------- +Tue May 24 15:48:53 UTC 2022 - Scott Bradnick + +- Fixing up 'stop-iris-flicker.patch' patch name to follow standards. + ------------------------------------------------------------------- Thu May 19 19:00:09 UTC 2022 - Stefan Dirsch @@ -25,12 +42,23 @@ Tue May 3 08:21:55 UTC 2022 - Stefan Dirsch * raised requirements to 9 GB disk space and added aarch64 architecture (bsc#1199040) +------------------------------------------------------------------- +Thu Apr 28 21:22:38 UTC 2022 - Scott Bradnick + +- Switching out 'directx-headers' for 'DirectX-Headers'. + ------------------------------------------------------------------- Fri Apr 22 09:06:31 UTC 2022 - Stefan Dirsch - Update to 22.0.2 * bugfix release with almost all nominated patches +------------------------------------------------------------------- +Thu Apr 14 19:29:21 UTC 2022 - Scott Bradnick + +- Adding changes I need for iris to not flicker and have d3d12 + available for use in WSL. + ------------------------------------------------------------------- Wed Apr 13 12:30:21 UTC 2022 - Dirk Müller @@ -159,6 +187,11 @@ Sat Jan 8 10:21:21 UTC 2022 - Stefan Dirsch * no longer disable sse2 support for intel drivers, since this breaks build, which is probably unresolvable (boo1190409) +------------------------------------------------------------------- +Fri Jan 7 19:35:29 UTC 2022 - Scott Bradnick + +- Adding 'stop-iris-flicker.patch'. + ------------------------------------------------------------------- Thu Jan 6 16:34:30 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 53ebaf1..ccb5489 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -126,7 +126,10 @@ Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch200: u_fix-build-on-ppc64le.patch Patch300: n_buildfix-21.3.0.patch Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch +Patch500: n_stop-iris-flicker.patch +BuildRequires: DirectX-Headers BuildRequires: bison +BuildRequires: cmake BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ @@ -741,6 +744,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %ifarch %{ix86} %patch400 -p1 %endif +%patch500 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... @@ -816,7 +820,7 @@ egl_platforms=x11,wayland %endif %ifarch %{ix86} x86_64 -Ddri-drivers= \ - -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus,i915 \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus,i915,d3d12 \ %else %ifarch %{arm} aarch64 -Ddri-drivers= \ diff --git a/n_stop-iris-flicker.patch b/n_stop-iris-flicker.patch new file mode 100644 index 0000000..bf2b9bb --- /dev/null +++ b/n_stop-iris-flicker.patch @@ -0,0 +1,20 @@ +commit 5d6f7baf3bc40a85b09e4088c8c3bccec6a7c82d +Author: Scott Bradnick +Date: Tue May 24 14:47:53 2022 -0400 + + Adjusting 'iris_batch.c' per 'https://gitlab.freedesktop.org/mesa/mesa/-/issues/5731'. + +diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c +index 71cb2096ad1..0a72d2a07c3 100644 +--- a/src/gallium/drivers/iris/iris_batch.c ++++ b/src/gallium/drivers/iris/iris_batch.c +@@ -926,8 +926,7 @@ submit_batch(struct iris_batch *batch) + (struct drm_i915_gem_exec_object2) { + .handle = bo->gem_handle, + .offset = bo->address, +- .flags = bo->real.kflags | (written ? EXEC_OBJECT_WRITE : 0) | +- (iris_bo_is_external(bo) ? 0 : EXEC_OBJECT_ASYNC), ++ .flags = bo->real.kflags | (written ? EXEC_OBJECT_WRITE : 0), + }; + ++validation_count; + } From 1662fc6e3020ab8213eef1d86d53f9ba49c2070d08f0d44507b08e2b579e8551 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 25 May 2022 12:29:10 +0000 Subject: [PATCH 2/2] - buildrequire DirectX-Headers only on %{ix86} x86_64, since it's only relevant on these platforms OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1111 --- Mesa.changes | 6 ++++++ Mesa.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Mesa.changes b/Mesa.changes index 8e5251c..f12981b 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 25 12:27:30 UTC 2022 - Stefan Dirsch + +- buildrequire DirectX-Headers only on %{ix86} x86_64, since it's + only relevant on these platforms + ------------------------------------------------------------------- Tue May 24 19:18:59 UTC 2022 - Scott Bradnick diff --git a/Mesa.spec b/Mesa.spec index ccb5489..1183fd4 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -127,7 +127,9 @@ Patch200: u_fix-build-on-ppc64le.patch Patch300: n_buildfix-21.3.0.patch Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch Patch500: n_stop-iris-flicker.patch +%ifarch %{ix86} x86_64 BuildRequires: DirectX-Headers +%endif BuildRequires: bison BuildRequires: cmake BuildRequires: fdupes