diff options
| -rw-r--r-- | recipes-graphics/mesa/files/fix-meson-config-compat.patch | 31 | ||||
| -rw-r--r-- | recipes-graphics/mesa/mesa-git.inc | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/recipes-graphics/mesa/files/fix-meson-config-compat.patch b/recipes-graphics/mesa/files/fix-meson-config-compat.patch new file mode 100644 index 0000000..3eedbec --- /dev/null +++ b/recipes-graphics/mesa/files/fix-meson-config-compat.patch @@ -0,0 +1,31 @@ +Index: git/meson_options.txt +=================================================================== +--- git.orig/meson_options.txt ++++ git/meson_options.txt +@@ -45,7 +45,7 @@ option( + 'dri-drivers', + type : 'array', + value : ['auto'], +- choices : ['auto', 'i915', 'i965', 'r100', 'r200', 'nouveau', 'swrast'], ++ choices : ['', 'auto', 'i915', 'i965', 'r100', 'r200', 'nouveau', 'swrast'], + description : 'List of dri drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built' + ) + option( +@@ -65,7 +65,7 @@ option( + type : 'array', + value : ['auto'], + choices : [ +- 'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno', ++ '', 'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno', + 'swrast', 'v3d', 'vc4', 'etnaviv', 'tegra', 'i915', 'svga', 'virgl', + 'swr', 'panfrost', 'iris', 'lima', 'zink' + ], +@@ -165,7 +165,7 @@ option( + 'vulkan-drivers', + type : 'array', + value : ['auto'], +- choices : ['auto', 'amd', 'freedreno', 'intel'], ++ choices : ['', 'auto', 'amd', 'freedreno', 'intel'], + description : 'List of vulkan drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built' + ) + option( diff --git a/recipes-graphics/mesa/mesa-git.inc b/recipes-graphics/mesa/mesa-git.inc index 9b23681..bc41a3d 100644 --- a/recipes-graphics/mesa/mesa-git.inc +++ b/recipes-graphics/mesa/mesa-git.inc @@ -5,6 +5,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/mesa.git;protocol=https \ file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \ file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ + file://fix-meson-config-compat.patch \ " S = "${WORKDIR}/git" |