diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 0993ce7..b1c8061 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -1,7 +1,7 @@ # # spec file for package Mesa-drivers # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/Mesa.changes b/Mesa.changes index 26487e6..6b28748 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 6 16:34:30 UTC 2022 - Stefan Dirsch + +- n_no-sse2-on-ix86.patch + * disabled sse2 support on %ix86 (boo#1190409) + ------------------------------------------------------------------- Fri Dec 31 12:42:24 UTC 2021 - Aaron Stern diff --git a/Mesa.spec b/Mesa.spec index 4282365..b925153 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -1,7 +1,7 @@ # # spec file for package Mesa # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -134,6 +134,7 @@ Patch58: u_dep_xcb.patch 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.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -769,6 +770,9 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch100 -p1 %patch200 -p1 %patch300 -p1 +%ifarch %{ix86} +%patch400 -p1 +%endif # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/n_no-sse2-on-ix86.patch b/n_no-sse2-on-ix86.patch new file mode 100644 index 0000000..cb9e2cd --- /dev/null +++ b/n_no-sse2-on-ix86.patch @@ -0,0 +1,30 @@ +--- mesa-21.3.3/meson.build.orig 2022-01-06 17:30:29.318317000 +0100 ++++ mesa-21.3.3/meson.build 2022-01-06 17:31:48.709078000 +0100 +@@ -1237,24 +1237,9 @@ if host_machine.cpu_family().startswith( + sse41_args = ['-msse4.1'] + + if host_machine.cpu_family() == 'x86' +- if get_option('sse2') +- # These settings make generated GCC code match MSVC and follow +- # GCC advice on https://gcc.gnu.org/wiki/FloatingPointMath#x86note +- # +- # NOTE: We need to ensure stack is realigned given that we +- # produce shared objects, and have no control over the stack +- # alignment policy of the application. Therefore we need +- # -mstackrealign or -mincoming-stack-boundary=2. +- # +- # XXX: We could have SSE without -mstackrealign if we always used +- # __attribute__((force_align_arg_pointer)), but that's not +- # always the case. +- c_args += ['-msse2', '-mfpmath=sse', '-mstackrealign'] +- else +- # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but +- # that's not guaranteed +- sse41_args += '-mstackrealign' +- endif ++ # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but ++ # that's not guaranteed ++ sse41_args += '-mstackrealign' + endif + else + with_sse41 = false