From 40939ad4a3e76b35565a1443d551c6ec6aa15805bd8f3a76f4d49561ab199083 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 29 Jan 2020 13:36:55 +0000 Subject: [PATCH 1/5] - set optflags also for g++ compiler OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=914 --- Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 3 ++- Mesa.changes | 5 +++++ Mesa.spec | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 77a9e4b..af744af 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 29 13:34:34 UTC 2020 - Stefan Dirsch + +- set optflags also for g++ compiler + ------------------------------------------------------------------- Mon Jan 27 15:31:52 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index a2620c4..be2d5b8 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -839,7 +839,8 @@ egl_platforms=x11,drm,surfaceless -Dgallium-drivers= \ %endif -Db_ndebug=true \ - -Dc_args="%{optflags}" + -Dc_args="%{optflags}" \ + -Dcpp_args="%{optflags}" %meson_build diff --git a/Mesa.changes b/Mesa.changes index 77a9e4b..af744af 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 29 13:34:34 UTC 2020 - Stefan Dirsch + +- set optflags also for g++ compiler + ------------------------------------------------------------------- Mon Jan 27 15:31:52 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 6d4bb5d..86c0b6d 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -838,7 +838,8 @@ egl_platforms=x11,drm,surfaceless -Dgallium-drivers= \ %endif -Db_ndebug=true \ - -Dc_args="%{optflags}" + -Dc_args="%{optflags}" \ + -Dcpp_args="%{optflags}" %meson_build From b16d8b7271b18fd1f6f1474657ebb3f3755dd0993f27b6712c1484f0c4f641ac Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 29 Jan 2020 15:57:07 +0000 Subject: [PATCH 2/5] - Update to version 19.3.3 * There's plenty of changes here, but intel, docs, radeonsi, and aco are the biggest sets of changes. - supersedes U_0005-radv-Remove-syncobj_handle-variable-in-header.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=915 --- Mesa-drivers.changes | 8 ++++ Mesa-drivers.spec | 6 +-- Mesa.changes | 8 ++++ Mesa.spec | 6 +-- ...ve-syncobj_handle-variable-in-header.patch | 36 ------------------ mesa-19.3.2.tar.xz | 3 -- mesa-19.3.2.tar.xz.sig | Bin 119 -> 0 bytes mesa-19.3.3.tar.xz | 3 ++ mesa-19.3.3.tar.xz.sig | Bin 0 -> 119 bytes 9 files changed, 23 insertions(+), 47 deletions(-) delete mode 100644 U_0005-radv-Remove-syncobj_handle-variable-in-header.patch delete mode 100644 mesa-19.3.2.tar.xz delete mode 100644 mesa-19.3.2.tar.xz.sig create mode 100644 mesa-19.3.3.tar.xz create mode 100644 mesa-19.3.3.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index af744af..4a11c8d 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 29 14:59:10 UTC 2020 - Stefan Dirsch + +- Update to version 19.3.3 + * There's plenty of changes here, but intel, docs, radeonsi, + and aco are the biggest sets of changes. +- supersedes U_0005-radv-Remove-syncobj_handle-variable-in-header.patch + ------------------------------------------------------------------- Wed Jan 29 13:34:34 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index be2d5b8..daf172e 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.3.2 +%define _version 19.3.3 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -110,7 +110,7 @@ %endif Name: Mesa-drivers -Version: 19.3.2 +Version: 19.3.3 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -133,7 +133,6 @@ Patch61: U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patc Patch62: U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch Patch63: U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch Patch64: U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch -Patch65: U_0005-radv-Remove-syncobj_handle-variable-in-header.patch Patch66: U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch BuildRequires: bison BuildRequires: fdupes @@ -744,7 +743,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch62 -p1 %patch63 -p1 %patch64 -p1 -%patch65 -p1 %patch66 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when diff --git a/Mesa.changes b/Mesa.changes index af744af..4a11c8d 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 29 14:59:10 UTC 2020 - Stefan Dirsch + +- Update to version 19.3.3 + * There's plenty of changes here, but intel, docs, radeonsi, + and aco are the biggest sets of changes. +- supersedes U_0005-radv-Remove-syncobj_handle-variable-in-header.patch + ------------------------------------------------------------------- Wed Jan 29 13:34:34 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 86c0b6d..bbe5ec1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.3.2 +%define _version 19.3.3 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -109,7 +109,7 @@ %endif Name: Mesa -Version: 19.3.2 +Version: 19.3.3 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -132,7 +132,6 @@ Patch61: U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patc Patch62: U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch Patch63: U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch Patch64: U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch -Patch65: U_0005-radv-Remove-syncobj_handle-variable-in-header.patch Patch66: U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch BuildRequires: bison BuildRequires: fdupes @@ -743,7 +742,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch62 -p1 %patch63 -p1 %patch64 -p1 -%patch65 -p1 %patch66 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when diff --git a/U_0005-radv-Remove-syncobj_handle-variable-in-header.patch b/U_0005-radv-Remove-syncobj_handle-variable-in-header.patch deleted file mode 100644 index 5121b01..0000000 --- a/U_0005-radv-Remove-syncobj_handle-variable-in-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bd4380c63c3b8b8b5f60dc840809dbe96a222fd7 Mon Sep 17 00:00:00 2001 -From: Bas Nieuwenhuizen -Date: Tue, 21 Jan 2020 11:49:55 +0100 -Subject: [PATCH] radv: Remove syncobj_handle variable in header. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -I strongly suspect it was supposed to be a typedef. However, used -nowhere, we should remove it. - -Fixes: eaa56eab6da "radv: initial support for shared semaphores (v2)" -Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2385 -Reviewed-by: Michel Dänzer -Reviewed-by: Samuel Pitoiset -Tested-by: Marge Bot -Part-of: ---- - src/amd/vulkan/radv_radeon_winsys.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h -index c8790917bcc..5c7b1ab5118 100644 ---- a/src/amd/vulkan/radv_radeon_winsys.h -+++ b/src/amd/vulkan/radv_radeon_winsys.h -@@ -156,7 +156,6 @@ struct radeon_bo_metadata { - uint32_t metadata[64]; - }; - --uint32_t syncobj_handle; - struct radeon_winsys_fence; - - struct radeon_winsys_bo { --- -2.16.4 - diff --git a/mesa-19.3.2.tar.xz b/mesa-19.3.2.tar.xz deleted file mode 100644 index 960b174..0000000 --- a/mesa-19.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e3aee324616352bbc7f58d47ab573e10f68cc7719fd045bd6d3abcdd97ee1c1 -size 11834324 diff --git a/mesa-19.3.2.tar.xz.sig b/mesa-19.3.2.tar.xz.sig deleted file mode 100644 index 8305e9f4e5509ee7c8b78071e14992bb021d328e70bc69f45e44d3aca50a1436..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7r6epg)m4S;>04CBJ&+yMW z^J$yiw!ihO?=kHupP3e$QpGTFOZ0szcMH|GEV diff --git a/mesa-19.3.3.tar.xz b/mesa-19.3.3.tar.xz new file mode 100644 index 0000000..f45c7a1 --- /dev/null +++ b/mesa-19.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09 +size 11938700 diff --git a/mesa-19.3.3.tar.xz.sig b/mesa-19.3.3.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..229229cb66533740e7843f241574a618d506dbf5034d44b57b08e3f971d57982 GIT binary patch literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7r6lc(x!@$KU025IYWn}p3 z8?pZG Date: Wed, 29 Jan 2020 18:00:32 +0000 Subject: [PATCH 3/5] - enabled build of gallium based llvmpipe driver for s390x (related to jsc#IBM-369, jsc#SLE-7452) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=916 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 4 ++-- Mesa.changes | 6 ++++++ Mesa.spec | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 4a11c8d..aadcae7 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 29 17:15:01 UTC 2020 - Stefan Dirsch + +- enabled build of gallium based llvmpipe driver for s390x + (related to jsc#IBM-369, jsc#SLE-7452) + ------------------------------------------------------------------- Wed Jan 29 14:59:10 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index daf172e..e2d5e7a 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -827,8 +827,8 @@ egl_platforms=x11,drm,surfaceless -Ddri-drivers=nouveau \ -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast \ %else - -Ddri-drivers=swrast \ - -Dgallium-drivers= \ + -Ddri-drivers= \ + -Dgallium-drivers=swrast \ %endif %endif %endif diff --git a/Mesa.changes b/Mesa.changes index 4a11c8d..aadcae7 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 29 17:15:01 UTC 2020 - Stefan Dirsch + +- enabled build of gallium based llvmpipe driver for s390x + (related to jsc#IBM-369, jsc#SLE-7452) + ------------------------------------------------------------------- Wed Jan 29 14:59:10 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index bbe5ec1..fa8c103 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -826,8 +826,8 @@ egl_platforms=x11,drm,surfaceless -Ddri-drivers=nouveau \ -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast \ %else - -Ddri-drivers=swrast \ - -Dgallium-drivers= \ + -Ddri-drivers= \ + -Dgallium-drivers=swrast \ %endif %endif %endif From ed85efa52f5c3fe92c4647747c3ccfdb7a0f594b2afd65549fa66a9b0cb7aedb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 29 Jan 2020 22:57:56 +0000 Subject: [PATCH 4/5] - require and check for llvm-devel >= 9 instead of llvm9-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=917 --- Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 4 ++-- Mesa.changes | 5 +++++ Mesa.spec | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index aadcae7..39cf7a7 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 29 22:56:19 UTC 2020 - Stefan Dirsch + +- require and check for llvm-devel >= 9 instead of llvm9-devel + ------------------------------------------------------------------- Wed Jan 29 17:15:01 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index e2d5e7a..d5cfd12 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -214,7 +214,7 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} -BuildRequires: llvm9-devel +BuildRequires: llvm-devel >= 9.0.0 %endif %if 0%{with_opencl} @@ -732,7 +732,7 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %if 0%{with_llvm} -%if %{pkg_vcmp llvm9-devel >= 9.0} +%if %{pkg_vcmp llvm-devel >= 9.0} %patch1 -p1 %endif %endif diff --git a/Mesa.changes b/Mesa.changes index aadcae7..39cf7a7 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 29 22:56:19 UTC 2020 - Stefan Dirsch + +- require and check for llvm-devel >= 9 instead of llvm9-devel + ------------------------------------------------------------------- Wed Jan 29 17:15:01 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index fa8c103..9f1110f 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -213,7 +213,7 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} -BuildRequires: llvm9-devel +BuildRequires: llvm-devel >= 9.0.0 %endif %if 0%{with_opencl} @@ -731,7 +731,7 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %if 0%{with_llvm} -%if %{pkg_vcmp llvm9-devel >= 9.0} +%if %{pkg_vcmp llvm-devel >= 9.0} %patch1 -p1 %endif %endif From 665cf7fc962e4497cc3c71cf052fc6f29431491aafd9eaf3708b3bfc25c90e4f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 30 Jan 2020 00:00:43 +0000 Subject: [PATCH 5/5] - require and check for llvm-devel >= 9 instead of llvm9-devel on openSUSE OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=918 --- Mesa-drivers.changes | 3 ++- Mesa-drivers.spec | 10 ++++++++++ Mesa.changes | 3 ++- Mesa.spec | 10 ++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 39cf7a7..fcc97cf 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Jan 29 22:56:19 UTC 2020 - Stefan Dirsch -- require and check for llvm-devel >= 9 instead of llvm9-devel +- require and check for llvm-devel >= 9 instead of llvm9-devel on + openSUSE ------------------------------------------------------------------- Wed Jan 29 17:15:01 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index d5cfd12..761f959 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -214,7 +214,11 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} +%if 0%{?is_opensuse} BuildRequires: llvm-devel >= 9.0.0 +%else +BuildRequires: llvm9-devel +%endif %endif %if 0%{with_opencl} @@ -732,9 +736,15 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %if 0%{with_llvm} +%if 0%{?is_opensuse} %if %{pkg_vcmp llvm-devel >= 9.0} %patch1 -p1 %endif +%else +%if %{pkg_vcmp llvm9-devel >= 9.0} +%patch1 -p1 +%endif +%endif %endif %patch2 -p1 %patch54 -p1 diff --git a/Mesa.changes b/Mesa.changes index 39cf7a7..fcc97cf 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Jan 29 22:56:19 UTC 2020 - Stefan Dirsch -- require and check for llvm-devel >= 9 instead of llvm9-devel +- require and check for llvm-devel >= 9 instead of llvm9-devel on + openSUSE ------------------------------------------------------------------- Wed Jan 29 17:15:01 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 9f1110f..63337e9 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -213,7 +213,11 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} +%if 0%{?is_opensuse} BuildRequires: llvm-devel >= 9.0.0 +%else +BuildRequires: llvm9-devel +%endif %endif %if 0%{with_opencl} @@ -731,9 +735,15 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %if 0%{with_llvm} +%if 0%{?is_opensuse} %if %{pkg_vcmp llvm-devel >= 9.0} %patch1 -p1 %endif +%else +%if %{pkg_vcmp llvm9-devel >= 9.0} +%patch1 -p1 +%endif +%endif %endif %patch2 -p1 %patch54 -p1