diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 96c5459..b15f3f4 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Sat Apr 17 16:41:33 UTC 2021 - Aaron Puchert + +- Move osmesa build back to Mesa, which we can now do after + choosing another dummy driver there. +- Use LLVM-versioned libclc runtime dependency to ensure + bitcode compatibility. We have that in Tumbleweed and soon Leap. +- U_clover-Fix-build-with-llvm-12.patch + * Fixes build with LLVM 12. +- U_clover-Add-missing-include-for-llvm-12-build-fix.patch + * Fixes a missing header in the previous patch. + +------------------------------------------------------------------- +Sat Apr 17 14:39:04 UTC 2021 - Stefan Dirsch + +- Mesa-devel: no longer require libOSMesa-devel, since it's now + built in Mesa-drivers; packages should require it directly now, + preferrably via pkconfig(osmesa) ... + +------------------------------------------------------------------- +Sat Apr 17 12:45:17 UTC 2021 - Tobias Klausmann + +- Switch dummy driver for mesa package from "auto" xorg driver (i965) to + gallium swrast driver + +------------------------------------------------------------------- +Sat Apr 17 10:11:09 UTC 2021 - Stefan Dirsch + +- update to 21.0.2 + * many additions especially on the Radeon Vulkan (RADV) driver + front where sparse memory support is in place, AMD Smart Access + Memory / Resizable BAR optimizations, various RDNA 2 + improvements, rapid packed math for ACO, and more. + Elsewhere in Mesa 21.0 there are continued RadeonSI + optimizations, many Intel ANV and Iris improvements, OpenGL 3.3 + for Freedreno, DXGI Winsys was added and initial Direct3D 12 + code for WSL, OpenGL 4.1 for Zink, and more. +- moved osmesa build to Mesa-drivers since swrast driver has been + removed from Mesa + ------------------------------------------------------------------- Tue Apr 6 08:38:16 UTC 2021 - Andreas Schwab diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 3ef2e10..807cfbe 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 20.3.5 +%define _version 21.0.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -109,7 +109,7 @@ %endif Name: Mesa-drivers -Version: 20.3.5 +Version: 21.0.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -128,6 +128,8 @@ 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 @@ -616,7 +618,11 @@ This package contains the VDPAU state tracker for radeonsi. %package -n Mesa-libOpenCL Summary: Mesa OpenCL implementation Group: System/Libraries +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 +Requires: libclc(llvm%{_llvm_sonum}) +%else Requires: libclc +%endif %description -n Mesa-libOpenCL This package contains the Mesa OpenCL implementation or GalliumCompute. @@ -710,6 +716,8 @@ 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 ... @@ -734,13 +742,13 @@ egl_platforms=x11,wayland -Dgles2=false \ -Degl=true \ -Dglx=disabled \ - -Dosmesa=none \ + -Dosmesa=false \ %else -Dglvnd=true \ -Dgles1=true \ -Dgles2=true \ -Degl=true \ - -Dosmesa=classic \ + -Dosmesa=true \ -Dglx=auto \ -Dllvm=false \ -Dvulkan-drivers= \ @@ -797,8 +805,8 @@ egl_platforms=x11,wayland %endif %endif %else - -Ddri-drivers=swrast \ - -Dgallium-drivers= \ + -Ddri-drivers= \ + -Dgallium-drivers=swrast \ %endif %ifarch aarch64 %{ix86} x86_64 ppc64le s390x -Dvalgrind=true \ @@ -859,7 +867,7 @@ rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so %else -rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so +rm -f %{buildroot}/%{_libdir}/dri/*_dri.so rm -f %{buildroot}%{_libdir}/libGLES* # glvnd needs a default provider for indirect rendering where it cannot @@ -937,7 +945,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/pkgconfig/egl.pc %files KHR-devel -%dir %{_includedir}/KHR %{_includedir}/KHR %files libGL1 diff --git a/Mesa.changes b/Mesa.changes index 96c5459..b15f3f4 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Sat Apr 17 16:41:33 UTC 2021 - Aaron Puchert + +- Move osmesa build back to Mesa, which we can now do after + choosing another dummy driver there. +- Use LLVM-versioned libclc runtime dependency to ensure + bitcode compatibility. We have that in Tumbleweed and soon Leap. +- U_clover-Fix-build-with-llvm-12.patch + * Fixes build with LLVM 12. +- U_clover-Add-missing-include-for-llvm-12-build-fix.patch + * Fixes a missing header in the previous patch. + +------------------------------------------------------------------- +Sat Apr 17 14:39:04 UTC 2021 - Stefan Dirsch + +- Mesa-devel: no longer require libOSMesa-devel, since it's now + built in Mesa-drivers; packages should require it directly now, + preferrably via pkconfig(osmesa) ... + +------------------------------------------------------------------- +Sat Apr 17 12:45:17 UTC 2021 - Tobias Klausmann + +- Switch dummy driver for mesa package from "auto" xorg driver (i965) to + gallium swrast driver + +------------------------------------------------------------------- +Sat Apr 17 10:11:09 UTC 2021 - Stefan Dirsch + +- update to 21.0.2 + * many additions especially on the Radeon Vulkan (RADV) driver + front where sparse memory support is in place, AMD Smart Access + Memory / Resizable BAR optimizations, various RDNA 2 + improvements, rapid packed math for ACO, and more. + Elsewhere in Mesa 21.0 there are continued RadeonSI + optimizations, many Intel ANV and Iris improvements, OpenGL 3.3 + for Freedreno, DXGI Winsys was added and initial Direct3D 12 + code for WSL, OpenGL 4.1 for Zink, and more. +- moved osmesa build to Mesa-drivers since swrast driver has been + removed from Mesa + ------------------------------------------------------------------- Tue Apr 6 08:38:16 UTC 2021 - Andreas Schwab diff --git a/Mesa.spec b/Mesa.spec index 7ee9cb0..5b47b4a 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -40,7 +40,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 20.3.5 +%define _version 21.0.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -108,7 +108,7 @@ %endif Name: Mesa -Version: 20.3.5 +Version: 21.0.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -127,6 +127,8 @@ 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 @@ -615,7 +617,11 @@ This package contains the VDPAU state tracker for radeonsi. %package -n Mesa-libOpenCL Summary: Mesa OpenCL implementation Group: System/Libraries +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 +Requires: libclc(llvm%{_llvm_sonum}) +%else Requires: libclc +%endif %description -n Mesa-libOpenCL This package contains the Mesa OpenCL implementation or GalliumCompute. @@ -709,6 +715,8 @@ 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 ... @@ -733,13 +741,13 @@ egl_platforms=x11,wayland -Dgles2=false \ -Degl=true \ -Dglx=disabled \ - -Dosmesa=none \ + -Dosmesa=false \ %else -Dglvnd=true \ -Dgles1=true \ -Dgles2=true \ -Degl=true \ - -Dosmesa=classic \ + -Dosmesa=true \ -Dglx=auto \ -Dllvm=false \ -Dvulkan-drivers= \ @@ -796,8 +804,8 @@ egl_platforms=x11,wayland %endif %endif %else - -Ddri-drivers=swrast \ - -Dgallium-drivers= \ + -Ddri-drivers= \ + -Dgallium-drivers=swrast \ %endif %ifarch aarch64 %{ix86} x86_64 ppc64le s390x -Dvalgrind=true \ @@ -858,7 +866,7 @@ rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so %else -rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so +rm -f %{buildroot}/%{_libdir}/dri/*_dri.so rm -f %{buildroot}%{_libdir}/libGLES* # glvnd needs a default provider for indirect rendering where it cannot @@ -936,7 +944,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/pkgconfig/egl.pc %files KHR-devel -%dir %{_includedir}/KHR %{_includedir}/KHR %files libGL1 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 new file mode 100644 index 0000000..6d5a3a8 --- /dev/null +++ b/U_clover-Add-missing-include-for-llvm-12-build-fix.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 0000000..41c743c --- /dev/null +++ b/U_clover-Fix-build-with-llvm-12.patch @@ -0,0 +1,90 @@ +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-20.3.5.tar.xz b/mesa-20.3.5.tar.xz deleted file mode 100644 index 4d0fcd4..0000000 --- a/mesa-20.3.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:909a72df63dfa3c0844ccf44a26ac028d148297ed333ab51560893923d7691ce -size 14367412 diff --git a/mesa-20.3.5.tar.xz.sig b/mesa-20.3.5.tar.xz.sig deleted file mode 100644 index d326959..0000000 Binary files a/mesa-20.3.5.tar.xz.sig and /dev/null differ diff --git a/mesa-21.0.2.tar.xz b/mesa-21.0.2.tar.xz new file mode 100644 index 0000000..c48d65b --- /dev/null +++ b/mesa-21.0.2.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..0386294 Binary files /dev/null and b/mesa-21.0.2.tar.xz.sig differ