Compare commits
No commits in common. "imports/c8s/mesa-21.1.1-1.el8" and "c8" have entirely different histories.
imports/c8
...
c8
4
.gitignore
vendored
4
.gitignore
vendored
@ -1 +1,3 @@
|
|||||||
SOURCES/mesa-21.1.1.tar.xz
|
SOURCES/dataclasses-0.8.tar.gz
|
||||||
|
SOURCES/mesa-23.1.4.tar.xz
|
||||||
|
SOURCES/meson-0.61.4.tar.gz
|
||||||
|
@ -1 +1,3 @@
|
|||||||
538ca87d21c7e5200b52ec7190e9d9b73a036904 SOURCES/mesa-21.1.1.tar.xz
|
ef25d3e9e2523805baa314a4adcb915ae901740e SOURCES/dataclasses-0.8.tar.gz
|
||||||
|
8a48c0e1fbda2c9563ddcf95b05012ab00a8a692 SOURCES/mesa-23.1.4.tar.xz
|
||||||
|
b0ab169abd8ec87ce773a02b2c7d6a8664b8db00 SOURCES/meson-0.61.4.tar.gz
|
||||||
|
127
SOURCES/0001-clover-llvm-move-to-modern-pass-manager.patch
Normal file
127
SOURCES/0001-clover-llvm-move-to-modern-pass-manager.patch
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dave Airlie <airlied@redhat.com>
|
||||||
|
Date: Fri, 25 Aug 2023 12:43:44 +1000
|
||||||
|
Subject: [PATCH] clover/llvm: move to modern pass manager.
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
This seems like it should work, but I haven't tested it yet.
|
||||||
|
|
||||||
|
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
|
||||||
|
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24879>
|
||||||
|
---
|
||||||
|
.../frontends/clover/llvm/invocation.cpp | 64 +++++++++++++++----
|
||||||
|
1 file changed, 51 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
|
||||||
|
index 7a50fea3323..43d26fe1abb 100644
|
||||||
|
--- a/src/gallium/frontends/clover/llvm/invocation.cpp
|
||||||
|
+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
|
||||||
|
@@ -27,13 +27,17 @@
|
||||||
|
#include <llvm/IR/DiagnosticPrinter.h>
|
||||||
|
#include <llvm/IR/DiagnosticInfo.h>
|
||||||
|
#include <llvm/IR/LLVMContext.h>
|
||||||
|
+#include <llvm/IR/Module.h>
|
||||||
|
#include <llvm/Support/raw_ostream.h>
|
||||||
|
-#include <llvm/Transforms/IPO/PassManagerBuilder.h>
|
||||||
|
+#include <llvm/Transforms/IPO/Internalize.h>
|
||||||
|
#include <llvm-c/Target.h>
|
||||||
|
#ifdef HAVE_CLOVER_SPIRV
|
||||||
|
#include <LLVMSPIRVLib/LLVMSPIRVLib.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#include <llvm-c/TargetMachine.h>
|
||||||
|
+#include <llvm-c/Transforms/PassBuilder.h>
|
||||||
|
+#include <llvm/Support/CBindingWrapping.h>
|
||||||
|
#include <clang/CodeGen/CodeGenAction.h>
|
||||||
|
#include <clang/Lex/PreprocessorOptions.h>
|
||||||
|
#include <clang/Frontend/TextDiagnosticBuffer.h>
|
||||||
|
@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source,
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
void
|
||||||
|
- optimize(Module &mod, unsigned optimization_level,
|
||||||
|
+ optimize(Module &mod,
|
||||||
|
+ const std::string& ir_target,
|
||||||
|
+ unsigned optimization_level,
|
||||||
|
bool internalize_symbols) {
|
||||||
|
- ::llvm::legacy::PassManager pm;
|
||||||
|
-
|
||||||
|
// By default, the function internalizer pass will look for a function
|
||||||
|
// called "main" and then mark all other functions as internal. Marking
|
||||||
|
// functions as internal enables the optimizer to perform optimizations
|
||||||
|
@@ -458,19 +462,53 @@ namespace {
|
||||||
|
if (internalize_symbols) {
|
||||||
|
std::vector<std::string> names =
|
||||||
|
map(std::mem_fn(&Function::getName), get_kernels(mod));
|
||||||
|
- pm.add(::llvm::createInternalizePass(
|
||||||
|
+ internalizeModule(mod,
|
||||||
|
[=](const ::llvm::GlobalValue &gv) {
|
||||||
|
return std::find(names.begin(), names.end(),
|
||||||
|
gv.getName()) != names.end();
|
||||||
|
- }));
|
||||||
|
+ });
|
||||||
|
}
|
||||||
|
|
||||||
|
- ::llvm::PassManagerBuilder pmb;
|
||||||
|
- pmb.OptLevel = optimization_level;
|
||||||
|
- pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl(
|
||||||
|
- ::llvm::Triple(mod.getTargetTriple()));
|
||||||
|
- pmb.populateModulePassManager(pm);
|
||||||
|
- pm.run(mod);
|
||||||
|
+
|
||||||
|
+ const char *opt_str = NULL;
|
||||||
|
+ LLVMCodeGenOptLevel level;
|
||||||
|
+ switch (optimization_level) {
|
||||||
|
+ case 0:
|
||||||
|
+ default:
|
||||||
|
+ opt_str = "default<O0>";
|
||||||
|
+ level = LLVMCodeGenLevelNone;
|
||||||
|
+ break;
|
||||||
|
+ case 1:
|
||||||
|
+ opt_str = "default<O1>";
|
||||||
|
+ level = LLVMCodeGenLevelLess;
|
||||||
|
+ break;
|
||||||
|
+ case 2:
|
||||||
|
+ opt_str = "default<O2>";
|
||||||
|
+ level = LLVMCodeGenLevelDefault;
|
||||||
|
+ break;
|
||||||
|
+ case 3:
|
||||||
|
+ opt_str = "default<O3>";
|
||||||
|
+ level = LLVMCodeGenLevelAggressive;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ const target &target = ir_target;
|
||||||
|
+ LLVMTargetRef targ;
|
||||||
|
+ char *err_message;
|
||||||
|
+
|
||||||
|
+ if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message))
|
||||||
|
+ return;
|
||||||
|
+ LLVMTargetMachineRef tm =
|
||||||
|
+ LLVMCreateTargetMachine(targ, target.triple.c_str(),
|
||||||
|
+ target.cpu.c_str(), "", level,
|
||||||
|
+ LLVMRelocDefault, LLVMCodeModelDefault);
|
||||||
|
+
|
||||||
|
+ if (!tm)
|
||||||
|
+ return;
|
||||||
|
+ LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions();
|
||||||
|
+ LLVMRunPasses(wrap(&mod), opt_str, tm, opts);
|
||||||
|
+
|
||||||
|
+ LLVMDisposeTargetMachine(tm);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Module>
|
||||||
|
@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector<binary> &binaries,
|
||||||
|
auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log);
|
||||||
|
auto mod = link(*ctx, *c, binaries, r_log);
|
||||||
|
|
||||||
|
- optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library);
|
||||||
|
+ optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library);
|
||||||
|
|
||||||
|
static std::atomic_uint seq(0);
|
||||||
|
const std::string id = "." + mod->getModuleIdentifier() + "-" +
|
||||||
|
--
|
||||||
|
2.42.0
|
||||||
|
|
@ -0,0 +1,41 @@
|
|||||||
|
From 9ba416cdc67073cdda9a73fe9d37304b82bdd526 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
|
||||||
|
Date: Fri, 12 May 2023 09:58:26 +0200
|
||||||
|
Subject: [PATCH] llvmpipe: only include old Transform includes when needed
|
||||||
|
|
||||||
|
This fixes building with recent LLVM where these 2 .h files
|
||||||
|
were removed.
|
||||||
|
|
||||||
|
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8671
|
||||||
|
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
|
||||||
|
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22980>
|
||||||
|
---
|
||||||
|
src/gallium/auxiliary/gallivm/lp_bld_init.c | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
||||||
|
index 24d082398e9..9e0d6a5f643 100644
|
||||||
|
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
||||||
|
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
||||||
|
@@ -42,14 +42,14 @@
|
||||||
|
|
||||||
|
#include <llvm/Config/llvm-config.h>
|
||||||
|
#include <llvm-c/Analysis.h>
|
||||||
|
-#include <llvm-c/Transforms/Scalar.h>
|
||||||
|
-#if LLVM_VERSION_MAJOR >= 7
|
||||||
|
-#include <llvm-c/Transforms/Utils.h>
|
||||||
|
-#endif
|
||||||
|
#include <llvm-c/BitWriter.h>
|
||||||
|
#if GALLIVM_USE_NEW_PASS == 1
|
||||||
|
#include <llvm-c/Transforms/PassBuilder.h>
|
||||||
|
#elif GALLIVM_HAVE_CORO == 1
|
||||||
|
+#include <llvm-c/Transforms/Scalar.h>
|
||||||
|
+#if LLVM_VERSION_MAJOR >= 7
|
||||||
|
+#include <llvm-c/Transforms/Utils.h>
|
||||||
|
+#endif
|
||||||
|
#if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
|
||||||
|
#include <llvm-c/Transforms/IPO.h>
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
2.42.0
|
||||||
|
|
@ -0,0 +1,28 @@
|
|||||||
|
From 460d2c46a903fed295a1528c8b6273dd6b0e0d19 Mon Sep 17 00:00:00 2001
|
||||||
|
From: thfrwn <11335318+rfht@users.noreply.github.com>
|
||||||
|
Date: Fri, 9 Feb 2024 17:00:55 -0500
|
||||||
|
Subject: [PATCH] mesa: fix off-by-one for newblock allocation in dlist_alloc
|
||||||
|
|
||||||
|
Cc: mesa-stable
|
||||||
|
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
|
||||||
|
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27556>
|
||||||
|
---
|
||||||
|
src/mesa/main/dlist.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
|
||||||
|
index b0184a24e20..9213641699a 100644
|
||||||
|
--- a/src/mesa/main/dlist.c
|
||||||
|
+++ b/src/mesa/main/dlist.c
|
||||||
|
@@ -1220,7 +1220,7 @@ dlist_alloc(struct gl_context *ctx, OpCode opcode, GLuint bytes, bool align8)
|
||||||
|
ctx->ListState.CurrentPos++;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (ctx->ListState.CurrentPos + numNodes + contNodes > BLOCK_SIZE) {
|
||||||
|
+ if (ctx->ListState.CurrentPos + numNodes + contNodes >= BLOCK_SIZE) {
|
||||||
|
/* This block is full. Allocate a new block and chain to it */
|
||||||
|
Node *newblock;
|
||||||
|
Node *n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
VERSION ?= 21.1.1
|
VERSION ?= 23.1.4
|
||||||
SANITIZE ?= 1
|
SANITIZE ?= 1
|
||||||
|
|
||||||
DIRNAME = mesa-${VERSION}
|
DIRNAME = mesa-${VERSION}
|
||||||
|
12
SOURCES/fix-py-ver.patch
Normal file
12
SOURCES/fix-py-ver.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up mesa-23.1.4/meson.build.dma mesa-23.1.4/meson.build
|
||||||
|
--- mesa-23.1.4/meson.build.dma 2023-07-28 10:15:41.807945483 +1000
|
||||||
|
+++ mesa-23.1.4/meson.build 2023-07-28 10:15:46.465030794 +1000
|
||||||
|
@@ -835,7 +835,7 @@ if get_option('allow-kcmp') \
|
||||||
|
pre_args += '-DALLOW_KCMP'
|
||||||
|
endif
|
||||||
|
|
||||||
|
-prog_python = import('python').find_installation('python3')
|
||||||
|
+prog_python = import('python').find_installation('python3.6')
|
||||||
|
has_mako = run_command(
|
||||||
|
prog_python, '-c',
|
||||||
|
'''
|
11
SOURCES/gnome-shell-glthread-disable.patch
Normal file
11
SOURCES/gnome-shell-glthread-disable.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf
|
||||||
|
--- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma 2022-11-25 10:32:32.175879868 +1000
|
||||||
|
+++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf 2022-11-25 10:32:43.743067470 +1000
|
||||||
|
@@ -653,6 +653,7 @@ TODO: document the other workarounds.
|
||||||
|
<application name="gnome-shell" executable="gnome-shell">
|
||||||
|
<option name="adaptive_sync" value="false" />
|
||||||
|
<option name="v3d_nonmsaa_texture_size_limit" value="true" />
|
||||||
|
+ <option name="mesa_glthread" value="false"/>
|
||||||
|
</application>
|
||||||
|
<application name="Desktop — Plasma" executable="plasmashell">
|
||||||
|
<option name="adaptive_sync" value="false" />
|
@ -1,9 +1,9 @@
|
|||||||
diff -up mesa-21.1.1/src/gallium/frontends/lavapipe/lvp_device.c.dma mesa-21.1.1/src/gallium/frontends/lavapipe/lvp_device.c
|
diff -up mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.cdma mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.c
|
||||||
--- mesa-21.1.1/src/gallium/frontends/lavapipe/lvp_device.c.dma 2021-05-20 13:08:02.207217380 +1000
|
--- mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.cdma 2021-11-18 06:16:20.000000000 +1000
|
||||||
+++ mesa-21.1.1/src/gallium/frontends/lavapipe/lvp_device.c 2021-05-20 13:08:35.868127094 +1000
|
+++ mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.c 2021-11-18 07:03:17.652283186 +1000
|
||||||
@@ -224,6 +224,9 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_Creat
|
@@ -213,6 +213,9 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_Creat
|
||||||
if (pAllocator == NULL)
|
if (pAllocator == NULL)
|
||||||
pAllocator = &default_alloc;
|
pAllocator = vk_default_allocator();
|
||||||
|
|
||||||
+ if (!getenv("RH_SW_VULKAN"))
|
+ if (!getenv("RH_SW_VULKAN"))
|
||||||
+ return VK_ERROR_INITIALIZATION_FAILED;
|
+ return VK_ERROR_INITIALIZATION_FAILED;
|
||||||
|
11
SOURCES/radeonsi-turn-off-glthread.patch
Normal file
11
SOURCES/radeonsi-turn-off-glthread.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -up mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h
|
||||||
|
--- mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma 2023-01-25 06:17:54.993167334 +1000
|
||||||
|
+++ mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h 2023-01-25 06:17:57.363203425 +1000
|
||||||
|
@@ -1,7 +1,6 @@
|
||||||
|
// DriConf options specific to radeonsi
|
||||||
|
DRI_CONF_SECTION_PERFORMANCE
|
||||||
|
DRI_CONF_ADAPTIVE_SYNC(true)
|
||||||
|
-DRI_CONF_MESA_GLTHREAD(true)
|
||||||
|
DRI_CONF_SECTION_END
|
||||||
|
|
||||||
|
DRI_CONF_SECTION_DEBUG
|
132
SPECS/mesa.spec
132
SPECS/mesa.spec
@ -9,10 +9,10 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{ix86} x86_64
|
%ifarch %{ix86} x86_64
|
||||||
%define platform_drivers i965
|
|
||||||
%define with_vmware 1
|
%define with_vmware 1
|
||||||
%define with_xa 1
|
%define with_xa 1
|
||||||
%define with_iris 1
|
%define with_iris 1
|
||||||
|
%define with_crocus 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{ix86} x86_64
|
%ifarch %{ix86} x86_64
|
||||||
@ -25,22 +25,20 @@
|
|||||||
%define with_xa 1
|
%define with_xa 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global dri_drivers %{?platform_drivers}
|
|
||||||
|
|
||||||
%if 0%{?with_vulkan_hw}
|
%if 0%{?with_vulkan_hw}
|
||||||
%define vulkan_drivers swrast,intel,amd
|
%define vulkan_drivers swrast,intel,intel_hasvk,amd
|
||||||
%else
|
%else
|
||||||
%define vulkan_drivers swrast
|
%define vulkan_drivers swrast
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global sanitize 0
|
%global sanitize 0
|
||||||
|
|
||||||
#global rctag rc2
|
#global rctag rc4
|
||||||
|
|
||||||
Name: mesa
|
Name: mesa
|
||||||
Summary: Mesa graphics libraries
|
Summary: Mesa graphics libraries
|
||||||
Version: 21.1.1
|
Version: 23.1.4
|
||||||
Release: 1%{?rctag:.%{rctag}}%{?dist}
|
Release: 3%{?rctag:.%{rctag}}%{?dist}
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://www.mesa3d.org
|
URL: http://www.mesa3d.org
|
||||||
@ -54,12 +52,27 @@ Source3: Makefile
|
|||||||
# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
|
# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
|
||||||
Source4: Mesa-MLAA-License-Clarification-Email.txt
|
Source4: Mesa-MLAA-License-Clarification-Email.txt
|
||||||
|
|
||||||
|
# build our own newer meson
|
||||||
|
Source5: meson-0.61.4.tar.gz
|
||||||
|
Source6: dataclasses-0.8.tar.gz
|
||||||
|
|
||||||
Patch0: lavapipe-disable-env-var.patch
|
Patch0: lavapipe-disable-env-var.patch
|
||||||
|
|
||||||
|
Patch1: fix-py-ver.patch
|
||||||
|
Patch10: gnome-shell-glthread-disable.patch
|
||||||
|
Patch12: radeonsi-turn-off-glthread.patch
|
||||||
|
|
||||||
|
# Required to build against LLVM 17
|
||||||
|
Patch13: 0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
|
||||||
|
Patch14: 0001-clover-llvm-move-to-modern-pass-manager.patch
|
||||||
|
|
||||||
|
# https://issues.redhat.com/browse/RHEL-40566
|
||||||
|
Patch15: 0001-mesa-fix-off-by-one-for-newblock-allocation-in-dlist.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
|
||||||
BuildRequires: meson >= 0.45
|
BuildRequires: meson
|
||||||
%if %{with_hardware}
|
%if %{with_hardware}
|
||||||
BuildRequires: kernel-headers
|
BuildRequires: kernel-headers
|
||||||
%endif
|
%endif
|
||||||
@ -78,6 +91,7 @@ BuildRequires: libxshmfence-devel
|
|||||||
BuildRequires: elfutils
|
BuildRequires: elfutils
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
|
BuildRequires: glslang
|
||||||
BuildRequires: %{llvm_pkg_prefix}llvm-devel >= 3.4-7
|
BuildRequires: %{llvm_pkg_prefix}llvm-devel >= 3.4-7
|
||||||
%if 0%{?with_opencl}
|
%if 0%{?with_opencl}
|
||||||
BuildRequires: %{llvm_pkg_prefix}clang-devel >= 3.0
|
BuildRequires: %{llvm_pkg_prefix}clang-devel >= 3.0
|
||||||
@ -85,7 +99,7 @@ BuildRequires: %{llvm_pkg_prefix}clang-devel >= 3.0
|
|||||||
BuildRequires: elfutils-libelf-devel
|
BuildRequires: elfutils-libelf-devel
|
||||||
BuildRequires: libudev-devel
|
BuildRequires: libudev-devel
|
||||||
BuildRequires: bison flex
|
BuildRequires: bison flex
|
||||||
BuildRequires: pkgconfig(wayland-client)
|
BuildRequires: pkgconfig(wayland-client) >= 1.21.0
|
||||||
BuildRequires: pkgconfig(wayland-server)
|
BuildRequires: pkgconfig(wayland-server)
|
||||||
BuildRequires: pkgconfig(wayland-protocols)
|
BuildRequires: pkgconfig(wayland-protocols)
|
||||||
%if 0%{?with_vdpau}
|
%if 0%{?with_vdpau}
|
||||||
@ -153,6 +167,7 @@ Requires: libglvnd-egl%{?_isa} >= 1:1.2.0-1
|
|||||||
Summary: Mesa libEGL development package
|
Summary: Mesa libEGL development package
|
||||||
Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: libglvnd-devel%{?_isa} >= 1:1.2.0-1
|
Requires: libglvnd-devel%{?_isa} >= 1:1.2.0-1
|
||||||
|
Requires: libwayland-client >= 1.21.0
|
||||||
Provides: libEGL-devel
|
Provides: libEGL-devel
|
||||||
Provides: libEGL-devel%{?_isa}
|
Provides: libEGL-devel%{?_isa}
|
||||||
|
|
||||||
@ -282,6 +297,7 @@ Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release
|
|||||||
%package vulkan-drivers
|
%package vulkan-drivers
|
||||||
Summary: Mesa Vulkan drivers
|
Summary: Mesa Vulkan drivers
|
||||||
Requires: vulkan%{_isa}
|
Requires: vulkan%{_isa}
|
||||||
|
Requires: libwayland-client >= 1.21.0
|
||||||
|
|
||||||
%description vulkan-drivers
|
%description vulkan-drivers
|
||||||
The drivers with support for the Vulkan API.
|
The drivers with support for the Vulkan API.
|
||||||
@ -310,27 +326,37 @@ Headers for development with the Vulkan API.
|
|||||||
|
|
||||||
cp %{SOURCE4} docs/
|
cp %{SOURCE4} docs/
|
||||||
|
|
||||||
|
tar -xvf %{SOURCE5}
|
||||||
|
tar -xvf %{SOURCE6}
|
||||||
|
|
||||||
pathfix.py -i %{__python3} -pn bin/*.py src/egl/generate/*.py \
|
pathfix.py -i %{__python3} -pn bin/*.py src/egl/generate/*.py \
|
||||||
src/gallium/tools/trace/*.py \
|
src/gallium/tools/trace/*.py \
|
||||||
src/compiler/glsl/tests/*.py \
|
src/compiler/glsl/tests/*.py \
|
||||||
src/compiler/glsl/glcpp/tests/*.py
|
src/compiler/glsl/glcpp/tests/*.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
cd meson-0.61.4
|
||||||
|
%py3_build
|
||||||
|
%py3_install
|
||||||
|
cd -
|
||||||
|
cd dataclasses-0.8
|
||||||
|
%py3_build
|
||||||
|
%py3_install
|
||||||
|
cd -
|
||||||
export ASFLAGS="--generate-missing-build-notes=yes"
|
export ASFLAGS="--generate-missing-build-notes=yes"
|
||||||
%meson -Dcpp_std=gnu++14 \
|
%global __meson %{buildroot}/usr/bin/meson
|
||||||
|
export PYTHONPATH=/usr/lib/python3.6/site-packages/:%{buildroot}/usr/lib/python3.6/site-packages/
|
||||||
|
%meson -Dcpp_std=gnu++17 \
|
||||||
-Db_ndebug=true \
|
-Db_ndebug=true \
|
||||||
-Dplatforms=x11,wayland \
|
-Dplatforms=x11,wayland \
|
||||||
-Ddri3=enabled \
|
-Ddri3=enabled \
|
||||||
-Ddri-drivers=%{?dri_drivers} \
|
|
||||||
-Dosmesa=true \
|
-Dosmesa=true \
|
||||||
%if 0%{?with_hardware}
|
%if 0%{?with_hardware}
|
||||||
-Dgallium-drivers=swrast%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_kmsro:,kmsro} \
|
-Dgallium-drivers=swrast%{?with_crocus:,crocus}%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_kmsro:,kmsro} \
|
||||||
%else
|
%else
|
||||||
-Dgallium-drivers=swrast,virgl \
|
-Dgallium-drivers=swrast,virgl \
|
||||||
%endif
|
%endif
|
||||||
-Dgallium-vdpau=%{?with_vdpau:true}%{!?with_vdpau:false} \
|
-Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \
|
||||||
-Dgallium-xvmc=false \
|
|
||||||
-Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
|
-Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
|
||||||
-Dgallium-va=%{?with_vaapi:true}%{!?with_vaapi:false} \
|
-Dgallium-va=%{?with_vaapi:true}%{!?with_vaapi:false} \
|
||||||
-Dgallium-xa=%{?with_xa:true}%{!?with_xa:false} \
|
-Dgallium-xa=%{?with_xa:true}%{!?with_xa:false} \
|
||||||
@ -344,7 +370,7 @@ export ASFLAGS="--generate-missing-build-notes=yes"
|
|||||||
-Dopengl=true \
|
-Dopengl=true \
|
||||||
-Dgbm=enabled \
|
-Dgbm=enabled \
|
||||||
-Dglx=dri \
|
-Dglx=dri \
|
||||||
-Degl=true \
|
-Degl=enabled \
|
||||||
-Dglvnd=true \
|
-Dglvnd=true \
|
||||||
-Dmicrosoft-clc=disabled \
|
-Dmicrosoft-clc=disabled \
|
||||||
-Dllvm=true \
|
-Dllvm=true \
|
||||||
@ -352,12 +378,25 @@ export ASFLAGS="--generate-missing-build-notes=yes"
|
|||||||
-Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \
|
-Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \
|
||||||
-Dbuild-tests=false \
|
-Dbuild-tests=false \
|
||||||
-Dselinux=true \
|
-Dselinux=true \
|
||||||
|
-Dlibunwind=disabled \
|
||||||
|
-Dlmsensors=disabled \
|
||||||
|
-Dandroid-libbacktrace=disabled \
|
||||||
%{nil}
|
%{nil}
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
cd meson-0.61.4
|
||||||
|
%py3_install
|
||||||
|
cd -
|
||||||
|
export PYTHONPATH=%{buildroot}/usr/lib/python3.6/site-packages/
|
||||||
%meson_install
|
%meson_install
|
||||||
|
|
||||||
|
#nuke the meson install bits
|
||||||
|
rm -rf %{buildroot}/usr/lib/python3.6/
|
||||||
|
rm -f %{buildroot}/usr/bin/meson
|
||||||
|
rm -rf %{buildroot}/usr/share/man/
|
||||||
|
rm -f %{buildroot}/usr/share/polkit-1/actions/com.mesonbuild.install.policy
|
||||||
|
|
||||||
# libvdpau opens the versioned name, don't bother including the unversioned
|
# libvdpau opens the versioned name, don't bother including the unversioned
|
||||||
rm -vf %{buildroot}%{_libdir}/vdpau/*.so
|
rm -vf %{buildroot}%{_libdir}/vdpau/*.so
|
||||||
# likewise glvnd
|
# likewise glvnd
|
||||||
@ -410,7 +449,7 @@ done
|
|||||||
%files libEGL-devel
|
%files libEGL-devel
|
||||||
%dir %{_includedir}/EGL
|
%dir %{_includedir}/EGL
|
||||||
%{_includedir}/EGL/eglmesaext.h
|
%{_includedir}/EGL/eglmesaext.h
|
||||||
%{_includedir}/EGL/eglextchromium.h
|
%{_includedir}/EGL/eglext_angle.h
|
||||||
|
|
||||||
%post libglapi -p /sbin/ldconfig
|
%post libglapi -p /sbin/ldconfig
|
||||||
%postun libglapi -p /sbin/ldconfig
|
%postun libglapi -p /sbin/ldconfig
|
||||||
@ -485,7 +524,7 @@ done
|
|||||||
%{_libdir}/dri/r600_dri.so
|
%{_libdir}/dri/r600_dri.so
|
||||||
%{_libdir}/dri/radeonsi_dri.so
|
%{_libdir}/dri/radeonsi_dri.so
|
||||||
%ifarch %{ix86} x86_64
|
%ifarch %{ix86} x86_64
|
||||||
%{_libdir}/dri/i965_dri.so
|
%{_libdir}/dri/crocus_dri.so
|
||||||
%{_libdir}/dri/iris_dri.so
|
%{_libdir}/dri/iris_dri.so
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?with_vc4}
|
%if 0%{?with_vc4}
|
||||||
@ -518,6 +557,7 @@ done
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{?with_vdpau}
|
%if 0%{?with_vdpau}
|
||||||
%files vdpau-drivers
|
%files vdpau-drivers
|
||||||
|
%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
|
||||||
%{_libdir}/vdpau/libvdpau_nouveau.so.1*
|
%{_libdir}/vdpau/libvdpau_nouveau.so.1*
|
||||||
%{_libdir}/vdpau/libvdpau_r600.so.1*
|
%{_libdir}/vdpau/libvdpau_r600.so.1*
|
||||||
%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
|
%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
|
||||||
@ -527,12 +567,16 @@ done
|
|||||||
%files vulkan-drivers
|
%files vulkan-drivers
|
||||||
%if 0%{?with_vulkan_hw}
|
%if 0%{?with_vulkan_hw}
|
||||||
%{_libdir}/libvulkan_intel.so
|
%{_libdir}/libvulkan_intel.so
|
||||||
|
%{_libdir}/libvulkan_intel_hasvk.so
|
||||||
%{_libdir}/libvulkan_radeon.so
|
%{_libdir}/libvulkan_radeon.so
|
||||||
|
%{_datadir}/drirc.d/00-radv-defaults.conf
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
%{_datadir}/vulkan/icd.d/intel_icd.x86_64.json
|
%{_datadir}/vulkan/icd.d/intel_icd.x86_64.json
|
||||||
|
%{_datadir}/vulkan/icd.d/intel_hasvk_icd.x86_64.json
|
||||||
%{_datadir}/vulkan/icd.d/radeon_icd.x86_64.json
|
%{_datadir}/vulkan/icd.d/radeon_icd.x86_64.json
|
||||||
%else
|
%else
|
||||||
%{_datadir}/vulkan/icd.d/intel_icd.i686.json
|
%{_datadir}/vulkan/icd.d/intel_icd.i686.json
|
||||||
|
%{_datadir}/vulkan/icd.d/intel_hasvk_icd.i686.json
|
||||||
%{_datadir}/vulkan/icd.d/radeon_icd.i686.json
|
%{_datadir}/vulkan/icd.d/radeon_icd.i686.json
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
@ -546,6 +590,58 @@ done
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 20 2024 José Expósito <jexposit@redhat.com> - 23.1.4-3
|
||||||
|
- Fix off-by-one error for newblock allocation in dlist_alloc
|
||||||
|
Resolves: https://issues.redhat.com/browse/RHEL-40566
|
||||||
|
|
||||||
|
* Thu Nov 23 2023 José Expósito <jexposit@redhat.com> - 23.1.4-2
|
||||||
|
- Rebuild against LLVM 17
|
||||||
|
|
||||||
|
* Thu Jul 27 2023 Dave Airlie <airlied@redhat.com> - 23.1.4-1
|
||||||
|
- Update to 23.1.4
|
||||||
|
|
||||||
|
* Mon May 22 2023 Dave Airlie <airlied@redhat.com> - 23.1.0-1
|
||||||
|
- Update to 23.1.0
|
||||||
|
|
||||||
|
* Fri Jan 27 2023 Dave Airlie <airlied@redhat.com> - 22.3.0-2
|
||||||
|
- disable glthread for radeonsi (breaks totem)
|
||||||
|
|
||||||
|
* Wed Dec 07 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-1
|
||||||
|
- Update to 22.3.0 final + fix mit-shm regression
|
||||||
|
|
||||||
|
* Fri Nov 25 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-0.4
|
||||||
|
- Disable glthread for gnome-shell
|
||||||
|
|
||||||
|
* Thu Nov 24 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-0.3
|
||||||
|
- Update to 22.3.0-rc4 + fix wayland dep version
|
||||||
|
|
||||||
|
* Wed Nov 23 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-0.2
|
||||||
|
- Update to 22.3.0-rc3 + fix glthread regression fix
|
||||||
|
|
||||||
|
* Fri Nov 11 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-0.1
|
||||||
|
- Update to 22.3.0-rc2
|
||||||
|
|
||||||
|
* Tue Aug 09 2022 Dave Airlie <airlied@redhat.com> - 22.1.5-1
|
||||||
|
- Update to 22.1.5 - add some crocus and llvmpipe fixes
|
||||||
|
|
||||||
|
* Mon Jun 06 2022 Dave Airlie <airlied@redhat.com> - 22.1.1-1
|
||||||
|
- Update to 22.1.1 - switch to crocus, drop legacy unused i965 driver.
|
||||||
|
|
||||||
|
* Tue Jan 25 2022 Dave Airlie <airlied@redhat.com> - 21.3.4-1
|
||||||
|
- Update to 23.1.4 for gbm and leak fixes, add iris regression fix
|
||||||
|
|
||||||
|
* Thu Nov 18 2021 Dave Airlie <airlied@redhat.com> - 21.3.0-1
|
||||||
|
- rebase to 23.1.0
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Dave Airlie <airlied@redhat.com> - 21.1.5-1
|
||||||
|
- Fix vulkan sw with wayland, pull in .4 + .5 fixes
|
||||||
|
|
||||||
|
* Sat Jun 19 2021 Dave Airlie <airlied@redhat.com> - 21.1.3-1
|
||||||
|
- rebase to 21.1.3
|
||||||
|
|
||||||
|
* Tue Jun 01 2021 Dave Airlie <airlied@redhat.com> - 21.1.1-2
|
||||||
|
- rebuild against llvm 12
|
||||||
|
|
||||||
* Thu May 20 2021 Dave Airlie <airlied@redhat.com> - 21.1.1-1
|
* Thu May 20 2021 Dave Airlie <airlied@redhat.com> - 21.1.1-1
|
||||||
- Update to 21.1.1
|
- Update to 21.1.1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user