开源软件构建与测试

_service:extract_file:mesa.spec Changed

@@ -1,285 +1,247 @@
-%ifnarch s390x
-%global with_hardware 1
-%global with_vulkan_hw 1
-%global with_vdpau 1
-%global with_va 1
-%global with_nine 1
-%global with_omx 1
-%global with_opencl 1
-%global with_r300 1
-%global with_r600 1
-%global with_radeonsi 1
-%global with_vmware 1
-%global base_vulkan ,amd
+%global llvm_toolset %{nil}
+%global llvm_pkg_prefix %{nil}
+
+%ifarch s390x
+%define with_hardware 0
+%else
+%define with_hardware 1
+%define with_vdpau 1
+%define with_omx 1
+%define with_opencl 1
+%define with_vaapi 1
+%define with_nine 1
 %endif
 
 %ifarch %{ix86} x86_64
-%global with_crocus 1
-%global with_i915   1
-%global with_iris   1
-%global with_xa     1
-%global platform_vulkan ,intel,intel_hasvk
+%define platform_drivers i965
+%define with_vmware 1
+%define with_xa     1
+%define with_iris   1
+%define with_crocus 1
 %endif
- 
-%ifarch aarch64
-%global with_etnaviv   1
-%global with_lima      1
-%global with_vc4       1
-%global with_v3d       1
-%global with_freedreno 1
-%global with_kmsro     1
-%global with_panfrost  1
-%global with_tegra     1
-%global with_xa        1
-%global platform_vulkan ,broadcom,freedreno,panfrost
+
+%ifarch %{ix86} x86_64
+%define with_vulkan_hw 1
+%else
+%define with_vulkan_hw 0
 %endif
- 
-%ifarch riscv64
-%global with_xa        1
+
+%ifarch %{arm} aarch64 sw_64
+%define with_xa        1
 %endif
 
-%ifarch %{valgrind_arches}
-%bcond_without valgrind
+%global dri_drivers %{?platform_drivers}
+
+%if 0%{?with_vulkan_hw}
+%define vulkan_drivers swrast,intel,amd,intel_hasvk
 %else
-%bcond_with valgrind
+%define vulkan_drivers swrast
 %endif
- 
-%global vulkan_drivers swrast%{?base_vulkan}%{?platform_vulkan}
- 
+
+%global sanitize 0
+
 Name:           mesa
 Summary:        Mesa graphics libraries
-%global ver 22.3.2
-Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        1
+Version:        23.0.0
+Release:        3
+
 License:        MIT
 URL:            http://www.mesa3d.org
+Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}.tar.xz
 
-Source0:        https://archive.mesa3d.org/mesa-%{ver}.tar.xz
-# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
- 
-Patch0:        0001-llvmpipe-add-an-implementation-with-llvm-orcjit.patch
-Patch1:        0002-llvmpipe-add-riscv-support-in-orcjit.patch
-Patch2:        lp_init_clock_hook.patch
+# Patch1:         backport-fix-build-err-on-arm.patch
+# Patch2:         0001-evergreen-big-endian.patch
 
-BuildRequires:  meson >= 0.61.4
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-%if 0%{?with_hardware}
+
+BuildRequires:  meson >= 0.45
+%if %{with_hardware}
 BuildRequires:  kernel-headers
 %endif
-# We only check for the minimum version of pkgconfig(libdrm) needed so that the
-# SRPMs for each arch still have the same build dependencies. See:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1859515
-BuildRequires:  pkgconfig(libdrm) >= 2.4.97
-BuildRequires:  pkgconfig(libclc)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(zlib) >= 1.2.3
-BuildRequires:  pkgconfig(libselinux)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-protocols) >= 1.8
-BuildRequires:  pkgconfig(wayland-client) >= 1.11
-BuildRequires:  pkgconfig(wayland-server) >= 1.11
-BuildRequires:  pkgconfig(wayland-egl-backend) >= 3
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xdamage) >= 1.1
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(xcb-glx) >= 1.8.1
-BuildRequires:  pkgconfig(xxf86vm)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(x11-xcb)
-BuildRequires:  pkgconfig(xcb-dri2) >= 1.8
-BuildRequires:  pkgconfig(xcb-dri3)
-BuildRequires:  pkgconfig(xcb-present)
-BuildRequires:  pkgconfig(xcb-sync)
-BuildRequires:  pkgconfig(xshmfence) >= 1.1
-BuildRequires:  pkgconfig(dri2proto) >= 2.8
-BuildRequires:  pkgconfig(glproto) >= 1.4.14
-BuildRequires:  pkgconfig(xcb-xfixes)
-BuildRequires:  pkgconfig(xcb-randr)
-BuildRequires:  pkgconfig(xrandr) >= 1.3
-BuildRequires:  bison
-BuildRequires:  flex
+BuildRequires:  libdrm-devel >= 2.4.103
+BuildRequires:  libXxf86vm-devel
+BuildRequires:  expat-devel
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  libselinux-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXfixes-devel
+BuildRequires:  libXdamage-devel
+BuildRequires:  libXi-devel
+BuildRequires:  libXrandr-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libxshmfence-devel
+BuildRequires:  elfutils
+BuildRequires:  python3-devel
+BuildRequires:  gettext
+BuildRequires: %{llvm_pkg_prefix}llvm-devel >= 3.4-7
+%if 0%{?with_opencl}
+BuildRequires: %{llvm_pkg_prefix}clang-devel >= 3.0
+%endif
+BuildRequires: elfutils-libelf-devel
+BuildRequires: libudev-devel
+BuildRequires: bison flex
+BuildRequires: pkgconfig(wayland-client)
+BuildRequires: pkgconfig(wayland-server)
+BuildRequires: pkgconfig(wayland-protocols)
 %if 0%{?with_vdpau}
-BuildRequires:  pkgconfig(vdpau) >= 1.1
+BuildRequires: libvdpau-devel
 %endif
-%if 0%{?with_va}
-BuildRequires:  pkgconfig(libva) >= 0.38.0
+%if 0%{?with_vaapi}
+BuildRequires: libva-devel
 %endif
+BuildRequires: pkgconfig(zlib)
 %if 0%{?with_omx}
-BuildRequires:  pkgconfig(libomxil-bellagio)
+BuildRequires: libomxil-bellagio-devel
 %endif
-BuildRequires:  pkgconfig(libelf)
-BuildRequires:  pkgconfig(libglvnd) >= 1.3.2
 %if 0%{?with_opencl}
-BuildRequires:  llvm-devel >= 7.0.0
+BuildRequires: libclc-devel opencl-filesystem
 BuildRequires:  clang-devel
+BuildRequires:  rust-bindgen
 BuildRequires:  rust-packaging
 BuildRequires:  pkgconfig(libclc)
 BuildRequires:  pkgconfig(SPIRV-Tools)
 BuildRequires:  pkgconfig(LLVMSPIRVLib)
-BuildRequires:  rust-bindgen 
 %endif
-%if %{with valgrind}
-BuildRequires:  pkgconfig(valgrind)

_service:extract_file:0001-evergreen-big-endian.patch Added

_service:extract_file:0001-llvmpipe-add-an-implementation-with-llvm-orcjit.patch Deleted

@@ -1,2377 +0,0 @@
-diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c
-index 81ceefc..4fdd7f3 100644
---- a/src/gallium/auxiliary/draw/draw_context.c
-+++ b/src/gallium/auxiliary/draw/draw_context.c
-@@ -76,7 +76,11 @@ draw_create_context(struct pipe_context *pipe, void *context,
- 
- #ifdef DRAW_LLVM_AVAILABLE
-    if (try_llvm && draw_get_option_use_llvm()) {
-+#if GALLIVM_USE_ORCJIT == 1
-+      draw->llvm = draw_llvm_create(draw, (LLVMOrcThreadSafeContextRef)context);
-+#else
-       draw->llvm = draw_llvm_create(draw, (LLVMContextRef)context);
-+#endif
-    }
- #endif
- 
-diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
-index 50c157b..e029cc7 100644
---- a/src/gallium/auxiliary/draw/draw_llvm.c
-+++ b/src/gallium/auxiliary/draw/draw_llvm.c
-@@ -766,8 +766,13 @@ get_vertex_header_ptr_type(struct draw_llvm_variant *variant)
- /**
-  * Create per-context LLVM info.
-  */
-+#if GALLIVM_USE_ORCJIT == 1
-+struct draw_llvm *
-+draw_llvm_create(struct draw_context *draw, LLVMOrcThreadSafeContextRef context)
-+#else
- struct draw_llvm *
- draw_llvm_create(struct draw_context *draw, LLVMContextRef context)
-+#endif
- {
-    struct draw_llvm *llvm;
- 
-@@ -780,6 +785,16 @@ draw_llvm_create(struct draw_context *draw, LLVMContextRef context)
- 
-    llvm->draw = draw;
- 
-+#if GALLIVM_USE_ORCJIT == 1
-+   llvm->_ts_context = context;
-+   if (!llvm->_ts_context) {
-+      llvm->_ts_context = LLVMOrcCreateNewThreadSafeContext();
-+      llvm->context_owned = true;
-+   }
-+   if (!llvm->_ts_context)
-+      goto fail;
-+   llvm->context = LLVMOrcThreadSafeContextGetContext(llvm->_ts_context);
-+#else
-    llvm->context = context;
-    if (!llvm->context) {
-       llvm->context = LLVMContextCreate();
-@@ -792,6 +807,7 @@ draw_llvm_create(struct draw_context *draw, LLVMContextRef context)
-    }
-    if (!llvm->context)
-       goto fail;
-+#endif
- 
-    llvm->nr_variants = 0;
-    list_inithead(&llvm->vs_variants_list.list);
-@@ -819,9 +835,16 @@ fail:
- void
- draw_llvm_destroy(struct draw_llvm *llvm)
- {
-+#if GALLIVM_USE_ORCJIT == 1
-+   if (llvm->context_owned)
-+      LLVMOrcDisposeThreadSafeContext(llvm->_ts_context);
-+   llvm->_ts_context = NULL;
-+   llvm->context = NULL;
-+#else
-    if (llvm->context_owned)
-       LLVMContextDispose(llvm->context);
-    llvm->context = NULL;
-+#endif
- 
-    /* XXX free other draw_llvm data? */
-    FREE(llvm);
-@@ -895,7 +918,11 @@ draw_llvm_create_variant(struct draw_llvm *llvm,
-       if (!cached.data_size)
-          needs_caching = true;
-    }
-+#if GALLIVM_USE_ORCJIT == 1
-+   variant->gallivm = gallivm_create(module_name, llvm->_ts_context, &cached);
-+#else
-    variant->gallivm = gallivm_create(module_name, llvm->context, &cached);
-+#endif
- 
-    create_jit_types(variant);
- 
-@@ -914,8 +941,13 @@ draw_llvm_create_variant(struct draw_llvm *llvm,
- 
-    gallivm_compile_module(variant->gallivm);
- 
-+#if GALLIVM_USE_ORCJIT == 1
-+   variant->jit_func = (draw_jit_vert_func)
-+         gallivm_jit_function(variant->gallivm, variant->function_name);
-+#else
-    variant->jit_func = (draw_jit_vert_func)
-          gallivm_jit_function(variant->gallivm, variant->function);
-+#endif
- 
-    if (needs_caching)
-       llvm->draw->disk_cache_insert_shader(llvm->draw->disk_cache_cookie,
-@@ -1990,6 +2022,10 @@ draw_llvm_generate(struct draw_llvm *llvm, struct draw_llvm_variant *variant)
- 
-    variant_func = LLVMAddFunction(gallivm->module, func_name, func_type);
-    variant->function = variant_func;
-+#if GALLIVM_USE_ORCJIT == 1
-+   variant->function_name = MALLOC(strlen(func_name)+1);
-+   strcpy(variant->function_name, func_name);
-+#endif
- 
-    LLVMSetFunctionCallConv(variant_func, LLVMCCallConv);
-    for (i = 0; i < num_arg_types; ++i)
-@@ -2684,6 +2720,11 @@ draw_llvm_destroy_variant(struct draw_llvm_variant *variant)
-    variant->shader->variants_cached--;
-    list_del(&variant->list_item_global.list);
-    llvm->nr_variants--;
-+
-+#if GALLIVM_USE_ORCJIT == 1
-+   if(variant->function_name)
-+      FREE(variant->function_name);
-+#endif
-    FREE(variant);
- }
- 
-@@ -2798,6 +2839,10 @@ draw_gs_llvm_generate(struct draw_llvm *llvm,
-    variant_func = LLVMAddFunction(gallivm->module, func_name, func_type);
- 
-    variant->function = variant_func;
-+#if GALLIVM_USE_ORCJIT == 1
-+   variant->function_name = MALLOC(strlen(func_name)+1);
-+   strcpy(variant->function_name, func_name);
-+#endif
- 
-    LLVMSetFunctionCallConv(variant_func, LLVMCCallConv);
- 
-@@ -2957,7 +3002,11 @@ draw_gs_llvm_create_variant(struct draw_llvm *llvm,
-       if (!cached.data_size)
-          needs_caching = true;
-    }
-+#if GALLIVM_USE_ORCJIT == 1
-+   variant->gallivm = gallivm_create(module_name, llvm->_ts_context, &cached);
-+#else
-    variant->gallivm = gallivm_create(module_name, llvm->context, &cached);
-+#endif
- 
-    create_gs_jit_types(variant);
- 
-@@ -2968,8 +3017,13 @@ draw_gs_llvm_create_variant(struct draw_llvm *llvm,
- 
-    gallivm_compile_module(variant->gallivm);
- 
-+#if GALLIVM_USE_ORCJIT == 1
-+   variant->jit_func = (draw_gs_jit_func)
-+         gallivm_jit_function(variant->gallivm, variant->function_name);
-+#else
-    variant->jit_func = (draw_gs_jit_func)
-          gallivm_jit_function(variant->gallivm, variant->function);
-+#endif
- 
-    if (needs_caching)
-       llvm->draw->disk_cache_insert_shader(llvm->draw->disk_cache_cookie,
-@@ -3002,6 +3056,10 @@ draw_gs_llvm_destroy_variant(struct draw_gs_llvm_variant *variant)
-    variant->shader->variants_cached--;
-    list_del(&variant->list_item_global.list);
-    llvm->nr_gs_variants--;
-+#if GALLIVM_USE_ORCJIT == 1
-+   if(variant->function_name)
-+      FREE(variant->function_name);
-+#endif
-    FREE(variant);
- }
- 
-@@ -3386,6 +3444,10 @@ draw_tcs_llvm_generate(struct draw_llvm *llvm,
-    variant_coro = LLVMAddFunction(gallivm->module, func_name_coro, coro_func_type);
- 
-    variant->function = variant_func;
-+#if GALLIVM_USE_ORCJIT == 1
-+   variant->function_name = MALLOC(strlen(func_name)+1);
-+   strcpy(variant->function_name, func_name);
-+#endif
-    LLVMSetFunctionCallConv(variant_func, LLVMCCallConv);
- 
-    LLVMSetFunctionCallConv(variant_coro, LLVMCCallConv);
-@@ -3619,8 +3681,11 @@ draw_tcs_llvm_create_variant(struct draw_llvm *llvm,
-       if (!cached.data_size)
-          needs_caching = true;
-    }
--
-+#if GALLIVM_USE_ORCJIT == 1
-+   variant->gallivm = gallivm_create(module_name, llvm->_ts_context, &cached);
-+#else
-    variant->gallivm = gallivm_create(module_name, llvm->context, &cached);
-+#endif
- 
-    create_tcs_jit_types(variant);
- 
-@@ -3631,10 +3696,18 @@ draw_tcs_llvm_create_variant(struct draw_llvm *llvm,
-

_service:extract_file:0002-llvmpipe-add-riscv-support-in-orcjit.patch Deleted

@@ -1,134 +0,0 @@
-From 6b006934c394ae9501cce56bc05c696ed575784c Mon Sep 17 00:00:00 2001
-From: Alex Fan <alex.fan.q@gmail.com>
-Date: Fri, 29 Jul 2022 12:44:14 +1000
-Subject: PATCH 2/2 llvmpipe: add riscv support in orcjit
-
-assume cpu supports extension +i,+m,+a,+f,+d,+c
----
- .../auxiliary/gallivm/lp_bld_init_orc.cpp     | 60 ++++++++++++++++++-
- src/gallium/include/pipe/p_config.h           | 10 ++++
- 2 files changed, 68 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
-index 62ec382f795..b422f282fe2 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
-@@ -45,7 +45,7 @@
- /* conflict with ObjectLinkingLayer.h */
- #include "util/u_memory.h"
- 
--#if (defined(_WIN32) && LLVM_VERSION_MAJOR >= 15)
-+#if defined(PIPE_ARCH_RISCV64) || defined(PIPE_ARCH_RISCV32) || (defined(_WIN32) && LLVM_VERSION_MAJOR >= 15)
- /* use ObjectLinkingLayer (JITLINK backend) */
- #define USE_JITLINK
- #endif
-@@ -216,7 +216,7 @@ public:
-       using llvm::orc::ExecutorAddr;
-       JITDylib* JD = ::unwrap(jd);
-       auto func = ExitOnErr(LPJit::get_instance()->lljit->lookup(*JD, func_name));
--#if LLVM_VERSION_MAJOR >= 16
-+#if LLVM_VERSION_MAJOR >= 15
-       return func.toPtr<void *>();
- #else
-       return (void *)(func.getAddress());
-@@ -552,6 +552,30 @@ llvm::orc::JITTargetMachineBuilder LPJit::create_jtdb() {
-    options.StackAlignmentOverride = 4;
- #endif
- 
-+#if defined(PIPE_ARCH_RISCV64)
-+#if defined(__riscv_float_abi_soft)
-+   options.MCOptions.ABIName = "lp64";
-+#elif defined(__riscv_float_abi_single)
-+   options.MCOptions.ABIName = "lp64f";
-+#elif defined(__riscv_float_abi_double)
-+   options.MCOptions.ABIName = "lp64d";
-+#else
-+#error "GALLIVM: unknown target riscv float abi"
-+#endif
-+#endif
-+
-+#if defined(PIPE_ARCH_RISCV32)
-+#if defined(__riscv_float_abi_soft)
-+   options.MCOptions.ABIName = "ilp32";
-+#elif defined(__riscv_float_abi_single)
-+   options.MCOptions.ABIName = "ilp32f";
-+#elif defined(__riscv_float_abi_double)
-+   options.MCOptions.ABIName = "ilp32d";
-+#else
-+#error "GALLIVM: unknown target riscv float abi"
-+#endif
-+#endif
-+
-    JTMB.setOptions(options);
- 
-    std::vector<std::string> MAttrs;
-@@ -650,6 +674,14 @@ llvm::orc::JITTargetMachineBuilder LPJit::create_jtdb() {
-    MAttrs.push_back("+fp64");
- #endif
- 
-+#if defined(PIPE_ARCH_RISCV64)
-+   /* Before riscv is more matured and util_get_cpu_caps() is implemented,
-+    * assume this for now since most of linux capable riscv machine are
-+    * riscv64gc
-+    */
-+   MAttrs = {"+m","+c","+a","+d","+f"};
-+#endif
-+
-    JTMB.addFeatures(MAttrs);
- 
-    if (gallivm_debug & (GALLIVM_DEBUG_IR | GALLIVM_DEBUG_ASM | GALLIVM_DEBUG_DUMP_BC)) {
-@@ -717,6 +749,30 @@ llvm::orc::JITTargetMachineBuilder LPJit::create_jtdb() {
-       MCPU = util_get_cpu_caps()->has_msa ? "mips64r5" : "mips64r2";
- #endif
- 
-+#if defined(PIPE_ARCH_RISCV64)
-+   /**
-+    * should be fixed with https://reviews.llvm.org/D121149 in llvm 15,
-+    * set it anyway for llvm 14
-+    */
-+   if (MCPU == "generic")
-+      MCPU = "generic-rv64";
-+
-+   JTMB.setCodeModel(CodeModel::Medium);
-+   JTMB.setRelocationModel(Reloc::PIC_);
-+#endif
-+
-+#if defined(PIPE_ARCH_RISCV32)
-+   /**
-+    * should be fixed with https://reviews.llvm.org/D121149 in llvm 15,
-+    * set it anyway for llvm 14
-+    */
-+   if (MCPU == "generic")
-+      MCPU = "generic-rv32";
-+
-+   JTMB.setCodeModel(CodeModel::Medium);
-+   JTMB.setRelocationModel(Reloc::PIC_);
-+#endif
-+
-    JTMB.setCPU(MCPU);
-    if (gallivm_debug & (GALLIVM_DEBUG_IR | GALLIVM_DEBUG_ASM | GALLIVM_DEBUG_DUMP_BC)) {
-       debug_printf("llc -mcpu option: %s\n", MCPU.c_str());
-diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h
-index f35a7dc9f04..3674932a956 100644
---- a/src/gallium/include/pipe/p_config.h
-+++ b/src/gallium/include/pipe/p_config.h
-@@ -125,6 +125,16 @@
- #define  PIPE_ARCH_MIPS
- #endif
- 
-+#if defined(__riscv)
-+#if __riscv_xlen == 64
-+#define PIPE_ARCH_RISCV64
-+#elif __riscv_xlen == 32
-+#define PIPE_ARCH_RISCV32
-+#else
-+#error "pipe: unknown target riscv xlen"
-+#endif
-+#endif
-+
- /*
-  * Endian detection.
-  */
--- 
-2.38.1
-

_service:extract_file:backport-fix-build-err-on-arm.patch Added

_service:extract_file:lp_init_clock_hook.patch Deleted

_service Changed

_service:extract_file:mesa-22.3.2.tar.xz -> _service:extract_file:mesa-23.0.0.tar.xz Changed

_service:tar_scm:mesa-1672457652.a5ed3dc.tar Deleted

_service:tar_scm:mesa_port-1677393060.27f2337.tar Added

Changes of Revision 2