summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2020-12-19 00:34:21 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-20 00:03:05 +0000
commit81517d9c806fce05348413bc6b6186eb26898e89 (patch)
treef60d80881c3047fc1554d9141f5ee1afe0946831 /meta/recipes-graphics
parent718a4a8f3add9f1f825ce3528352ecfa6d77f395 (diff)
downloadpoky-81517d9c806fce05348413bc6b6186eb26898e89.tar.gz
mesa.inc: switch true/enabled false/disabled
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. (From OE-Core rev: acf78fd3d03e4fe07ee4ad677f178d17dc10ac7b) Signed-off-by: Trevor Woerner <twoerner@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc22
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index dba23f586f..011abe6e95 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -77,7 +77,7 @@ def check_buildtype(d):
77MESON_BUILDTYPE = "${@check_buildtype(d)}" 77MESON_BUILDTYPE = "${@check_buildtype(d)}"
78 78
79EXTRA_OEMESON = " \ 79EXTRA_OEMESON = " \
80 -Dshared-glapi=true \ 80 -Dshared-glapi=enabled \
81 -Dgallium-opencl=disabled \ 81 -Dgallium-opencl=disabled \
82 -Dglx-read-only-text=true \ 82 -Dglx-read-only-text=true \
83 -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ 83 -Dplatforms='${@",".join("${PLATFORMS}".split())}' \
@@ -98,13 +98,13 @@ PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl elf-tls x11"
98PACKAGECONFIG_remove_libc-musl = "elf-tls" 98PACKAGECONFIG_remove_libc-musl = "elf-tls"
99 99
100# "gbm" requires "dri", "opengl" 100# "gbm" requires "dri", "opengl"
101PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false" 101PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled"
102 102
103X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" 103X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr"
104# "x11" requires "opengl" 104# "x11" requires "opengl"
105PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" 105PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}"
106PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false" 106PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false"
107PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=true,-Dgallium-xvmc=false,libxvmc" 107PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc"
108PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" 108PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
109 109
110DRIDRIVERS_class-native = "swrast" 110DRIDRIVERS_class-native = "swrast"
@@ -113,7 +113,7 @@ DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915"
113DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" 113DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915"
114# "dri" requires "opengl" 114# "dri" requires "opengl"
115PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')}, -Ddri-drivers='', xorgproto libdrm" 115PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')}, -Ddri-drivers='', xorgproto libdrm"
116PACKAGECONFIG[dri3] = "-Ddri3=true, -Ddri3=false, xorgproto libxshmfence" 116PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence"
117 117
118# Vulkan drivers need dri3 enabled 118# Vulkan drivers need dri3 enabled
119# amd could be enabled as well but requires gallium-llvm with llvm >= 3.9 119# amd could be enabled as well but requires gallium-llvm with llvm >= 3.9
@@ -126,10 +126,10 @@ PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')},
126PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" 126PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
127 127
128# "gles" requires "opengl" 128# "gles" requires "opengl"
129PACKAGECONFIG[gles] = "-Dgles1=true -Dgles2=true, -Dgles1=false -Dgles2=false" 129PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2=disabled"
130 130
131# "egl" requires "dri", "opengl" 131# "egl" requires "dri", "opengl"
132PACKAGECONFIG[egl] = "-Degl=true, -Degl=false" 132PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled"
133 133
134PACKAGECONFIG[etnaviv] = "" 134PACKAGECONFIG[etnaviv] = ""
135PACKAGECONFIG[freedreno] = "" 135PACKAGECONFIG[freedreno] = ""
@@ -159,12 +159,12 @@ GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600',
159GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" 159GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}"
160 160
161PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers=''" 161PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers=''"
162PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \ 162PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm${MESA_LLVM_RELEASE} llvm-native \
163 elfutils" 163 elfutils"
164PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" 164PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled"
165PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial" 165PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial"
166 166
167PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=true,-Dgallium-vdpau=false,libvdpau" 167PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau"
168 168
169PACKAGECONFIG[lima] = "" 169PACKAGECONFIG[lima] = ""
170GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" 170GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}"
@@ -175,7 +175,7 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panf
175OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium', 'classic', d)}" 175OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium', 'classic', d)}"
176PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none" 176PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none"
177 177
178PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" 178PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
179 179
180# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) 180# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
181FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" 181FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"