- build amd vulkan driver for x86 platforms
- drop included patch
[<https://gitlab.freedesktop.org/mesa/mesa/-/blob/1fbdd37d4c1133ced5eb9812daa1fff04cbf5daa/meson.build#L1711>]
Signed-off-by: Markus Volk <[email protected]
<mailto:[email protected]>>
---
...e-cmake-dependency-detector-for-llvm.patch | 42
-------------------
.../{mesa-gl_23.2.1.bb => mesa-gl_23.3.0.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 7 ++--
.../mesa/{mesa_23.2.1.bb => mesa_23.3.0.bb} | 0
4 files changed, 3 insertions(+), 46 deletions(-)
delete mode 100644
meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
rename meta/recipes-graphics/mesa/{mesa-gl_23.2.1.bb =>
mesa-gl_23.3.0.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_23.2.1.bb =>
mesa_23.3.0.bb} (100%)
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
b/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
deleted file mode 100644
index 4cded0546d..0000000000
---
a/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 00d41cd5aa3f4b494dc276c9b4ccdc096310c91f Mon Sep 17 00:00:00
2001
-From: Khem Raj <[email protected] <mailto:[email protected]>>
-Date: Thu, 28 Sep 2023 15:34:22 -0700
-Subject: [PATCH] meson: use llvm-config instead of cmake to fix
linking errors with meson 1.2.1
-
-meson dependency auto dependency detection uses cmake and then
-config-tool to process dependencies, in mesa the logic to detect
llvm is
-using auto detection which means if it finds cmake then it will
try to
-use cmake method. Cmake method works ok except a case when llvm-dev
-package is installed on the build host then it generates its own
-native.meson file and ignores OE supplied meson.native file which
has
-correct llvm-config tool specified which is pointing to
llvm-config from
-native sysroot. The generated meson.native file points to one
found in
-/usr/bin and there onwards detector finds native install of llvm
and
-configures that into building native mesa package.
-
-Since cmake detector does not always work, disable it by default
and use
-config-tool which works in all cases. This is suggested in below
issues
-too
-
-A similar issue is open in meson upstream [1] and mesa [2]
-
-[1] <https://github.com/mesonbuild/meson/issues/10483>
-[2] <https://gitlab.freedesktop.org/mesa/mesa/-/issues/6738>
-
-Upstream-Status: Submitted
[<https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25438>]
-
-Signed-off-by: Khem Raj <[email protected]
<mailto:[email protected]>>
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/meson.build
-+++ b/meson.build
-@@ -1659,6 +1659,7 @@ with_llvm = false
- if _llvm.allowed()
- dep_llvm = dependency(
- 'llvm',
-+ method : host_machine.system() == 'windows' ? 'auto' :
'config-tool',
- version : _llvm_version,
- modules : llvm_modules,
- optional_modules : llvm_optional_modules,
diff --git a/meta/recipes-graphics/mesa/mesa-gl_23.2.1.bb
b/meta/recipes-graphics/mesa/mesa-gl_23.3.0.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_23.2.1.bb
rename to meta/recipes-graphics/mesa/mesa-gl_23.3.0.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index e5c405a972..b3df71cb60 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -18,10 +18,9 @@ SRC_URI =
"https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0001-meson.build-check-for-all-linux-host_os-combinations.patch
<file://0001-meson.build-check-for-all-linux-host_os-combinations.patch/>
\
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
<file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch/> \
file://0001-gallium-Fix-build-with-llvm-17.patch
<file://0001-gallium-fix-build-with-llvm-17.patch/> \
-
file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
<file://0001-meson-disable-cmake-dependency-detector-for-llvm.patch/>
\
"
-SRC_URI[sha256sum] =
"64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc"
+SRC_URI[sha256sum] =
"50f729dd60ed6335b989095baad81ef5edf7cfdd4b4b48b9b955917cb07d69c5"
UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
@@ -105,8 +104,8 @@ PACKAGECONFIG[dri3] = "-Ddri3=enabled,
-Ddri3=disabled, xorgproto libxshmfence"
# Vulkan drivers need dri3 enabled
# amd could be enabled as well but requires gallium-llvm with llvm
>= 3.9
VULKAN_DRIVERS = ""
-VULKAN_DRIVERS:append:x86 = ",intel"
-VULKAN_DRIVERS:append:x86-64 = ",intel"
+VULKAN_DRIVERS:append:x86 = ",intel,amd"
+VULKAN_DRIVERS:append:x86-64 = ",intel,amd"
# i686 is a 32 bit override for mesa-native
VULKAN_DRIVERS:append:i686 = ",intel"
VULKAN_DRIVERS:append ="${@bb.utils.contains
<mailto:${@bb.utils.contains>('PACKAGECONFIG', 'freedreno',
',freedreno', '', d)}"
diff --git a/meta/recipes-graphics/mesa/mesa_23.2.1.bb
b/meta/recipes-graphics/mesa/mesa_23.3.0.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_23.2.1.bb
rename to meta/recipes-graphics/mesa/mesa_23.3.0.bb
--
2.42.1
