开源软件构建与测试

Changes of Revision 5

_service:tar_scm:mesa.spec Changed

@@ -61,12 +61,16 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        24.2.1
-Release:        1
+Release:        3
 
 License:        MIT
 URL:            http://www.mesa3d.org
 Source0:        https://archive.mesa3d.org/%{name}-%{version}.tar.xz
 
+# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31108/
+# adding for resolving libepoxy's testing issues on x86_64 & aarch64
+Patch1:        31108.patch
+
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 
@@ -334,7 +338,7 @@
   -Ddri3=enabled \
   -Dosmesa=true \
 %if 0%{?with_hardware}
-  -Dgallium-drivers=swrast%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r300,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_crocus:,crocus} \
+  -Dgallium-drivers=swrast%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r300,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_crocus:,crocus}%{?with_vulkan_hw:,zink} \
 %else
   -Dgallium-drivers=swrast,virgl \
 %endif
@@ -558,6 +562,10 @@
 %{_libdir}/dri/udl_dri.so
 %endif
 
+%ifarch %{ix86} x86_64 %{arm} aarch64 riscv64
+%{_libdir}/dri/zink_dri.so
+%endif
+
 %if %{with_hardware}
 %if 0%{?with_omx}
 %files omx-drivers
@@ -602,6 +610,12 @@
 %endif
 
 %changelog
+* Tue Sep 24 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 24.2.1-3
+- fix the `unpackaged file zink_dri.so issue` for riscv64
+
+* Tue Sep 10 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 24.2.1-2
+- add upstream gallivm patch, enable zink for {x86_64,aarch64}
+
 * Fri Aug 16 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 24.2.1-1
 - update to version 24.2.1
 - add va-drivers back, set video-codecs to 'all-free'

_service:tar_scm:31108.patch Added

@@ -0,0 +1,61 @@
+From afe6147af2be4093fbc5e69299e86015982658ec Mon Sep 17 00:00:00 2001
+From: Icenowy Zheng <uwu@icenowy.me>
+Date: Tue, 10 Sep 2024 17:00:30 +0800
+Subject: PATCH gallivm: use JITLink unconditionally with ORCJIT
+
+RuntimeDyld is getting deprecated along with MCJIT, so although it's
+possible to use it with ORCJIT now, using JITLink seems to be better.
+
+Drop the condition for enabling JITLink, to enforce it everywhere.
+
+Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp | 15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
+index f38db3a57fb03..202eaca4683b3 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
+@@ -58,12 +58,6 @@
+ /* conflict with ObjectLinkingLayer.h */
+ #include "util/u_memory.h"
+ 
+-#if DETECT_ARCH_RISCV64 == 1 || DETECT_ARCH_RISCV32 == 1 || DETECT_ARCH_LOONGARCH64 == 1 || (defined(_WIN32) && LLVM_VERSION_MAJOR >= 15)
+-/* use ObjectLinkingLayer (JITLINK backend) */
+-#define USE_JITLINK
+-#endif
+-/* else use old RTDyldObjectLinkingLayer (RuntimeDyld backend) */
+-
+ namespace {
+ 
+ class LPObjectCacheORC : public llvm::ObjectCache {
+@@ -334,24 +328,17 @@ LPJit::LPJit() :jit_dylib_count(0) {
+    tm = wrap(tm_unique.get());
+ 
+    /* Create an LLJIT instance with an ObjectLinkingLayer (JITLINK)
+-    * or RuntimeDyld as the base layer.
++    * as the base layer.
+     * intel & perf listeners are not supported by ObjectLinkingLayer yet
+     */
+    lljit = ExitOnErr(
+       LLJITBuilder()
+          .setJITTargetMachineBuilder(std::move(JTMB))
+-#ifdef USE_JITLINK
+          .setObjectLinkingLayerCreator(
+             &(ExecutionSession &ES, const llvm::Triple &TT) {
+                return std::make_unique<ObjectLinkingLayer>(
+                   ES, ExitOnErr(llvm::jitlink::InProcessMemoryManager::Create()));
+             })
+-#else
+-#if LLVM_USE_INTEL_JITEVENTS
+-         .RegisterJITEventListener(
+-               llvm::JITEventListener::createIntelJITEventListener())
+-#endif
+-#endif
+          .create());
+ 
+    LLVMOrcIRTransformLayerRef TL = wrap(&lljit->getIRTransformLayer());
+-- 
+GitLab
+