A number of options have been switched from true/false to enabled/disabled and
the older usage is deprecated, as is seen in the configuration logs:
../mesa-20.3.1/meson.build:92: WARNING: gles1 option "true" deprecated,
please use "enabled" instead.
../mesa-20.3.1/meson.build:100: WARNING: gles2 option "true"
deprecated, please use "enabled" instead.
../mesa-20.3.1/meson.build:119: WARNING: shared-glapi option "true"
deprecated, please use "enabled" instead.
../mesa-20.3.1/meson.build:381: WARNING: gbm option "true" deprecated,
please use "enabled" instead.
../mesa-20.3.1/meson.build:412: WARNING: egl option "true" deprecated,
please use "enabled" instead.
../mesa-20.3.1/meson.build:493: WARNING: dri3 option "false"
deprecated, please use "disabled" instead.
../mesa-20.3.1/meson.build:516: WARNING: gallium-vdpau option "false"
deprecated, please use "disabled" instead.
../mesa-20.3.1/meson.build:570: WARNING: gallium-xvmc option "false"
deprecated, please use "disabled" instead.
../mesa-20.3.1/meson.build:691: WARNING: gallium-va option "false"
deprecated, please use "disabled" instead.
../mesa-20.3.1/meson.build:727: WARNING: gallium-xa option "false"
deprecated, please use "disabled" instead.
Signed-off-by: Trevor Woerner <twoer...@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 2158c9eaf9..883c244471 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -73,7 +73,7 @@ def check_buildtype(d):
MESON_BUILDTYPE = "${@check_buildtype(d)}"
EXTRA_OEMESON = " \
- -Dshared-glapi=true \
+ -Dshared-glapi=enabled \
-Dgallium-opencl=disabled \
-Dglx-read-only-text=true \
-Dplatforms='${@",".join("${PLATFORMS}".split())}' \
@@ -94,13 +94,13 @@ PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl
elf-tls x11"
PACKAGECONFIG_remove_libc-musl = "elf-tls"
# "gbm" requires "dri", "opengl"
-PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false"
+PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled"
X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes
xrandr"
# "x11" requires "opengl"
PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}"
PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false"
-PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=true,-Dgallium-xvmc=false,libxvmc"
+PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc"
PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
DRIDRIVERS_class-native = "swrast"
@@ -109,7 +109,7 @@ DRIDRIVERS_append_x86_class-target =
",r100,r200,nouveau,i965,i915"
DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915"
# "dri" requires "opengl"
PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')},
-Ddri-drivers='', xorgproto libdrm"
-PACKAGECONFIG[dri3] = "-Ddri3=true, -Ddri3=false, xorgproto libxshmfence"
+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
@@ -122,10 +122,10 @@ PACKAGECONFIG[vulkan] =
"-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')},
PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
# "gles" requires "opengl"
-PACKAGECONFIG[gles] = "-Dgles1=true -Dgles2=true, -Dgles1=false -Dgles2=false"
+PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled
-Dgles2=disabled"
# "egl" requires "dri", "opengl"
-PACKAGECONFIG[egl] = "-Degl=true, -Degl=false"
+PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled"
PACKAGECONFIG[etnaviv] = ""
PACKAGECONFIG[freedreno] = ""
@@ -155,12 +155,12 @@ GALLIUMDRIVERS_append =
"${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600',
GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl',
',virgl', '', d)}"
PACKAGECONFIG[gallium] =
"-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers=''"
-PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false,
llvm${MESA_LLVM_RELEASE} llvm-native \
+PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled,
-Dllvm=disabled, llvm${MESA_LLVM_RELEASE} llvm-native \
elfutils"
-PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false"
-PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial"
+PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled"
+PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial"
-PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=true,-Dgallium-vdpau=false,libvdpau"
+PACKAGECONFIG[vdpau] =
"-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau"
PACKAGECONFIG[lima] = ""
GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima',
'', d)}"
@@ -171,7 +171,7 @@ GALLIUMDRIVERS_append
="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panf
OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium',
'classic', d)}"
PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none"
-PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
+PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
--
2.30.0.rc0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#145880):
https://lists.openembedded.org/g/openembedded-core/message/145880
Mute This Topic: https://lists.openembedded.org/mt/79078489/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
