From 13f39fa26ff92b1432228c9deb62d33d2901c379bdd1e81acfc14d323695c239 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 6 May 2021 12:24:11 +0000 Subject: [PATCH] - update to 21.1.0 * bunch of work here, lots of zink and softpipe, but bits and pieces of other things: tgsi, freddreno, nir, panfrost, intel, spirv, core gallium, radv, aco, r600, and core mesa. - supersedes patches U_clover-Fix-build-with-llvm-12.patch, U_clover-Add-missing-include-for-llvm-12-build-fix.patch - update to 21.0.3 * fixes in haiku, core mesa, radeonsi, lavapipe, nir, radv, anv, freedreno and turnip, etniviv, iris, egl, lima, core gallium, spriv, v3d, meson OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1034 --- Mesa-drivers.changes | 18 ++++ Mesa-drivers.spec | 8 +- Mesa.changes | 18 ++++ Mesa.spec | 8 +- ...issing-include-for-llvm-12-build-fix.patch | 28 ------ U_clover-Fix-build-with-llvm-12.patch | 90 ------------------ mesa-21.0.2.tar.xz | 3 - mesa-21.0.2.tar.xz.sig | Bin 119 -> 0 bytes mesa-21.1.0.tar.xz | 3 + mesa-21.1.0.tar.xz.sig | Bin 0 -> 329 bytes 10 files changed, 43 insertions(+), 133 deletions(-) delete mode 100644 U_clover-Add-missing-include-for-llvm-12-build-fix.patch delete mode 100644 U_clover-Fix-build-with-llvm-12.patch delete mode 100644 mesa-21.0.2.tar.xz delete mode 100644 mesa-21.0.2.tar.xz.sig create mode 100644 mesa-21.1.0.tar.xz create mode 100644 mesa-21.1.0.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index b15f3f4..b5ba9c3 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu May 6 11:45:47 UTC 2021 - Stefan Dirsch + +- update to 21.1.0 + * bunch of work here, lots of zink and softpipe, but bits and + pieces of other things: tgsi, freddreno, nir, panfrost, intel, + spirv, core gallium, radv, aco, r600, and core mesa. +- supersedes patches U_clover-Fix-build-with-llvm-12.patch, + U_clover-Add-missing-include-for-llvm-12-build-fix.patch + +------------------------------------------------------------------- +Wed Apr 21 20:54:43 UTC 2021 - Stefan Dirsch + +- update to 21.0.3 + * fixes in haiku, core mesa, radeonsi, lavapipe, nir, radv, anv, + freedreno and turnip, etniviv, iris, egl, lima, core gallium, + spriv, v3d, meson + ------------------------------------------------------------------- Sat Apr 17 16:41:33 UTC 2021 - Aaron Puchert diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 807cfbe..5edaa52 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 21.0.2 +%define _version 21.1.0 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -109,7 +109,7 @@ %endif Name: Mesa-drivers -Version: 21.0.2 +Version: 21.1.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -128,8 +128,6 @@ Patch2: n_add-Mesa-headers-again.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch -Patch101: U_clover-Fix-build-with-llvm-12.patch -Patch102: U_clover-Add-missing-include-for-llvm-12-build-fix.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -716,8 +714,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch54 -p1 %patch58 -p1 %patch100 -p1 -%patch101 -p1 -%patch102 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/Mesa.changes b/Mesa.changes index b15f3f4..b5ba9c3 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu May 6 11:45:47 UTC 2021 - Stefan Dirsch + +- update to 21.1.0 + * bunch of work here, lots of zink and softpipe, but bits and + pieces of other things: tgsi, freddreno, nir, panfrost, intel, + spirv, core gallium, radv, aco, r600, and core mesa. +- supersedes patches U_clover-Fix-build-with-llvm-12.patch, + U_clover-Add-missing-include-for-llvm-12-build-fix.patch + +------------------------------------------------------------------- +Wed Apr 21 20:54:43 UTC 2021 - Stefan Dirsch + +- update to 21.0.3 + * fixes in haiku, core mesa, radeonsi, lavapipe, nir, radv, anv, + freedreno and turnip, etniviv, iris, egl, lima, core gallium, + spriv, v3d, meson + ------------------------------------------------------------------- Sat Apr 17 16:41:33 UTC 2021 - Aaron Puchert diff --git a/Mesa.spec b/Mesa.spec index 5b47b4a..df635e3 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -40,7 +40,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 21.0.2 +%define _version 21.1.0 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -108,7 +108,7 @@ %endif Name: Mesa -Version: 21.0.2 +Version: 21.1.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -127,8 +127,6 @@ Patch2: n_add-Mesa-headers-again.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch -Patch101: U_clover-Fix-build-with-llvm-12.patch -Patch102: U_clover-Add-missing-include-for-llvm-12-build-fix.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -715,8 +713,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch54 -p1 %patch58 -p1 %patch100 -p1 -%patch101 -p1 -%patch102 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/U_clover-Add-missing-include-for-llvm-12-build-fix.patch b/U_clover-Add-missing-include-for-llvm-12-build-fix.patch deleted file mode 100644 index 6d5a3a8..0000000 --- a/U_clover-Add-missing-include-for-llvm-12-build-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f0dccd957879ff642cfd921dda6e8b04dd35fec4 Mon Sep 17 00:00:00 2001 -From: Karol Herbst -Date: Tue, 2 Mar 2021 20:09:39 +0100 -Subject: [PATCH] clover: Add missing include for llvm-12 build fix - -Fixes: d1eab2b1eb1 ("clover: Fix build with llvm-12.") -Signed-off-by: Karol Herbst -Reviewed-by: Francisco Jerez -Part-of: ---- - src/gallium/frontends/clover/llvm/compat.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp -index d537819f292..380d16a8346 100644 ---- a/src/gallium/frontends/clover/llvm/compat.hpp -+++ b/src/gallium/frontends/clover/llvm/compat.hpp -@@ -49,6 +49,7 @@ - - #include - #include -+#include - - #if LLVM_VERSION_MAJOR >= 10 - #include --- -2.31.1 - diff --git a/U_clover-Fix-build-with-llvm-12.patch b/U_clover-Fix-build-with-llvm-12.patch deleted file mode 100644 index 41c743c..0000000 --- a/U_clover-Fix-build-with-llvm-12.patch +++ /dev/null @@ -1,90 +0,0 @@ -From d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea Mon Sep 17 00:00:00 2001 -From: Karol Herbst -Date: Wed, 24 Feb 2021 12:44:41 +0100 -Subject: [PATCH] clover: Fix build with llvm-12. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix build error after LLVM commit c495dfe0268b ("[clang][cli] NFC: -Decrease the scope of ParseLangArgs parameters"). - -../src/gallium/frontends/clover/llvm/invocation.cpp: In function ‘std::unique_ptr {anonymous}::create_compiler_instance(const clover::device&, const string&, const std::vector >&, std::string&)’: -../src/gallium/frontends/clover/llvm/invocation.cpp:252:55: error: cannot convert ‘clang::PreprocessorOptions’ to ‘std::vector >&’ - 252 | c->getPreprocessorOpts(), - | ~~~~~~~~~~~~~~~~~~~~~~^~ - | | - | clang::PreprocessorOptions - -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4114 -Signed-off-by: Karol Herbst -Reviewed-by: Francisco Jerez -Part-of: ---- - src/gallium/frontends/clover/llvm/compat.hpp | 22 +++++++++++++++---- - .../frontends/clover/llvm/invocation.cpp | 5 ++--- - 2 files changed, 20 insertions(+), 7 deletions(-) - -diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp -index 78eb8c982a8..d537819f292 100644 ---- a/src/gallium/frontends/clover/llvm/compat.hpp -+++ b/src/gallium/frontends/clover/llvm/compat.hpp -@@ -38,14 +38,14 @@ - - #include - -+#include -+#include -+#include - #include - #include -+#include - #include - #include --#include -- --#include --#include - - #include - #include -@@ -88,6 +88,20 @@ namespace clover { - cinv, copts.data(), copts.data() + copts.size(), diag); - #endif - } -+ -+ static inline void -+ compiler_set_lang_defaults(std::unique_ptr &c, -+ clang::InputKind ik, const ::llvm::Triple& triple, -+ clang::LangStandard::Kind d) -+ { -+ c->getInvocation().setLangDefaults(c->getLangOpts(), ik, triple, -+#if LLVM_VERSION_MAJOR >= 12 -+ c->getPreprocessorOpts().Includes, -+#else -+ c->getPreprocessorOpts(), -+#endif -+ d); -+ } - } - } - } -diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp -index 536e952b100..30592e4343b 100644 ---- a/src/gallium/frontends/clover/llvm/invocation.cpp -+++ b/src/gallium/frontends/clover/llvm/invocation.cpp -@@ -247,9 +247,8 @@ namespace { - // http://www.llvm.org/bugs/show_bug.cgi?id=19735 - c->getDiagnosticOpts().ShowCarets = false; - -- c->getInvocation().setLangDefaults(c->getLangOpts(), -- compat::ik_opencl, ::llvm::Triple(target.triple), -- c->getPreprocessorOpts(), -+ compat::compiler_set_lang_defaults(c, compat::ik_opencl, -+ ::llvm::Triple(target.triple), - get_language_version(opts, device_clc_version)); - - c->createDiagnostics(new clang::TextDiagnosticPrinter( --- -2.31.1 - diff --git a/mesa-21.0.2.tar.xz b/mesa-21.0.2.tar.xz deleted file mode 100644 index c48d65b..0000000 --- a/mesa-21.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88 -size 14671512 diff --git a/mesa-21.0.2.tar.xz.sig b/mesa-21.0.2.tar.xz.sig deleted file mode 100644 index 03862947f60199fc94bba030493750c95ca8259b696031c84c0067a962fe5b8b..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7rl#u)A9RnAq08Aui5+lQQ z;T2*%l~aSWt?pRdiTB<5&&StMYny4x!~S*Y3y+=gU}Tssb8~jJlDp9D^D>p|yyf_} UMt5d@nKa$S-eha4TH7T?07=|3T>t<8 diff --git a/mesa-21.1.0.tar.xz b/mesa-21.1.0.tar.xz new file mode 100644 index 0000000..fc2d8c2 --- /dev/null +++ b/mesa-21.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0128f10e22970d3aed3d1034003731f94623015cd9797c07151417649c1b1ff8 +size 15145196 diff --git a/mesa-21.1.0.tar.xz.sig b/mesa-21.1.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..a765fb16a2704487d5eaa9f6393db1e59ba217487f2b2dfa2ef5d155ae3c4699 GIT binary patch literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0$`HUz7iZ|a%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uCH*yF6Y=bYxiryjhBm&lRJnZ4;udLJYz@4dy zCM?yTizR)>uUeSvMm9^5D5;;-iJlr4Q6@fS9$siw8-#Vnrpky!j@%4` z#N2b5HQ^sh=oOsb#>{YdFH9?Fl_OI2rB)-*=AlkHbVEK2J-FY=iDm30?1vjD>R>VI zl-{#v7|}s*;+)Dbq~=}k(M6tOi3`;Ek|c(;z=O$AC0gqLvbYm<7uf;{ZxsHv_L^En zJ%YVaAnLD0ASkF1Vb;Ph2Y1jKv4UNA;4+`CKS!un%IIp9z^8f0(>x%fk|4YLi-xV5 b?LLDK_urP_Scxc|a8S|GZ#f9b;-R4*tJRx> literal 0 HcmV?d00001