Accepting request 944902 from X11:XOrg

- rename n_no-sse2-on-ix86.patch to
  n_no-sse2-on-ix86-except-for-intel-drivers.patch
  * no longer disable sse2 support for intel drivers, since this
    breaks build, which is probably unresolvable (boo1190409)

- n_no-sse2-on-ix86.patch
  * disabled sse2 support on %ix86 (boo#1190409)

OBS-URL: https://build.opensuse.org/request/show/944902
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=425
This commit is contained in:
Dominique Leuenberger 2022-01-09 21:50:07 +00:00 committed by Git OBS Bridge
commit 042b26c1b9
5 changed files with 80 additions and 3 deletions

View File

@ -1,5 +1,19 @@
-------------------------------------------------------------------
Fri Dec 31 12:37:29 UTC 2021 - Aaron Stern <ukbeast89@protonmail.com>
Sat Jan 8 10:21:21 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- rename n_no-sse2-on-ix86.patch to
n_no-sse2-on-ix86-except-for-intel-drivers.patch
* no longer disable sse2 support for intel drivers, since this
breaks build, which is probably unresolvable (boo1190409)
-------------------------------------------------------------------
Thu Jan 6 16:34:30 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- n_no-sse2-on-ix86.patch
* disabled sse2 support on %ix86 (boo#1190409)
-------------------------------------------------------------------
Fri Dec 31 12:42:24 UTC 2021 - Aaron Stern <ukbeast89@protonmail.com>
- update to 21.3.3
* Bug fixes

View File

@ -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
@ -135,6 +135,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-except-for-intel-drivers.patch
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
@ -770,6 +771,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 ...

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sat Jan 8 10:21:21 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- rename n_no-sse2-on-ix86.patch to
n_no-sse2-on-ix86-except-for-intel-drivers.patch
* no longer disable sse2 support for intel drivers, since this
breaks build, which is probably unresolvable (boo1190409)
-------------------------------------------------------------------
Thu Jan 6 16:34:30 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- n_no-sse2-on-ix86.patch
* disabled sse2 support on %ix86 (boo#1190409)
-------------------------------------------------------------------
Fri Dec 31 12:42:24 UTC 2021 - Aaron Stern <ukbeast89@protonmail.com>

View File

@ -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-except-for-intel-drivers.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 ...

View File

@ -0,0 +1,41 @@
diff -u -r mesa-21.3.3.orig/meson.build mesa-21.3.3/meson.build
--- mesa-21.3.3.orig/meson.build 2022-01-06 19:34:26.332485000 +0100
+++ mesa-21.3.3/meson.build 2022-01-06 19:32:11.286680000 +0100
@@ -1231,35 +1231,8 @@
endif
endif
-if host_machine.cpu_family().startswith('x86') and cc.get_id() != 'msvc'
- pre_args += '-DUSE_SSE41'
- with_sse41 = true
- 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
- endif
-else
- with_sse41 = false
- sse41_args = []
-endif
+with_sse41 = false
+sse41_args = []
# Check for GCC style atomics
dep_atomic = null_dep