- 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
This commit is contained in:
Stefan Dirsch 2021-05-06 12:24:11 +00:00 committed by Git OBS Bridge
parent 8969889762
commit 13f39fa26f
10 changed files with 43 additions and 133 deletions

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu May 6 11:45:47 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com>
- 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 <aaronpuchert@alice-dsl.net>

View File

@ -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 ...

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu May 6 11:45:47 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com>
- 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 <aaronpuchert@alice-dsl.net>

View File

@ -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 ...

View File

@ -1,28 +0,0 @@
From f0dccd957879ff642cfd921dda6e8b04dd35fec4 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
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 <kherbst@redhat.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9372>
---
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 <clang/Basic/TargetInfo.h>
#include <clang/Frontend/CompilerInstance.h>
+#include <clang/Lex/PreprocessorOptions.h>
#if LLVM_VERSION_MAJOR >= 10
#include <llvm/Support/CodeGen.h>
--
2.31.1

View File

@ -1,90 +0,0 @@
From d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
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<clang::CompilerInstance> {anonymous}::create_compiler_instance(const clover::device&, const string&, const std::vector<std::__cxx11::basic_string<char> >&, std::string&):
../src/gallium/frontends/clover/llvm/invocation.cpp:252:55: error: cannot convert clang::PreprocessorOptions to std::vector<std::__cxx11::basic_string<char> >&
252 | c->getPreprocessorOpts(),
| ~~~~~~~~~~~~~~~~~~~~~~^~
| |
| clang::PreprocessorOptions
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4114
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8543>
---
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 <llvm/Config/llvm-config.h>
+#include <llvm/ADT/Triple.h>
+#include <llvm/Analysis/TargetLibraryInfo.h>
+#include <llvm/IR/LegacyPassManager.h>
#include <llvm/IR/LLVMContext.h>
#include <llvm/Linker/Linker.h>
+#include <llvm/Target/TargetMachine.h>
#include <llvm/Transforms/IPO.h>
#include <llvm/Transforms/Utils/Cloning.h>
-#include <llvm/Target/TargetMachine.h>
-
-#include <llvm/IR/LegacyPassManager.h>
-#include <llvm/Analysis/TargetLibraryInfo.h>
#include <clang/Basic/TargetInfo.h>
#include <clang/Frontend/CompilerInstance.h>
@@ -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<clang::CompilerInstance> &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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88
size 14671512

Binary file not shown.

3
mesa-21.1.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0128f10e22970d3aed3d1034003731f94623015cd9797c07151417649c1b1ff8
size 15145196

BIN
mesa-21.1.0.tar.xz.sig Normal file

Binary file not shown.