diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-10-28 22:05:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-30 13:22:49 +0000 |
commit | b6da9774f3ab9ce54869633b97c0ee7f6528f58d (patch) | |
tree | 39d373fded0c3a742a7f7b7fedd7118f98381095 /meta/recipes-graphics/mesa/mesa.inc | |
parent | afbdf052cb36c4d9d207868c793dfff34766cf86 (diff) | |
download | poky-b6da9774f3ab9ce54869633b97c0ee7f6528f58d.tar.gz |
mesa: update 20.1.8 -> 20.2.1
Build tweaks:
- drop separate dri option and the patch that adds it; just setting -Ddri-drivers='' is enough
- strip leading/trailing commas from drivers' lists, as upstream no longer allows blank entries if the list
is not empty (e.g. -Ddri-drivers=,driver1,driver2 is now producing an error).
- drop the long-obsolete llvm 3.3/3.2 logic
License-Update: reformatted into rst
(From OE-Core rev: 8682024ef029241c75e224174fd0b93835f88df3)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa.inc')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 9fc62e95e1..15f54c5acd 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -10,21 +10,20 @@ HOMEPAGE = "http://mesa3d.org" | |||
10 | BUGTRACKER = "https://bugs.freedesktop.org" | 10 | BUGTRACKER = "https://bugs.freedesktop.org" |
11 | SECTION = "x11" | 11 | SECTION = "x11" |
12 | LICENSE = "MIT" | 12 | LICENSE = "MIT" |
13 | LIC_FILES_CHKSUM = "file://docs/license.html;md5=c1843d93c460bbf778d6037ce324f9f7" | 13 | LIC_FILES_CHKSUM = "file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496" |
14 | 14 | ||
15 | PE = "2" | 15 | PE = "2" |
16 | 16 | ||
17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | 17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ |
18 | file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ | 18 | file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ |
19 | file://0002-meson.build-make-TLS-ELF-optional.patch \ | 19 | file://0002-meson.build-make-TLS-ELF-optional.patch \ |
20 | file://0003-Allow-enable-DRI-without-DRI-drivers.patch \ | ||
21 | file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \ | 20 | file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \ |
22 | file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ | 21 | file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ |
23 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 22 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
24 | file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ | 23 | file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ |
25 | " | 24 | " |
26 | 25 | ||
27 | SRC_URI[sha256sum] = "df21351494f7caaec5a3ccc16f14f15512e98d2ecde178bba1d134edc899b961" | 26 | SRC_URI[sha256sum] = "d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a" |
28 | 27 | ||
29 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 28 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
30 | 29 | ||
@@ -88,6 +87,9 @@ EXTRA_OEMESON = " \ | |||
88 | -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ | 87 | -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ |
89 | " | 88 | " |
90 | 89 | ||
90 | def strip_comma(s): | ||
91 | return s.strip(',') | ||
92 | |||
91 | PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ | 93 | PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ |
92 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium virgl', '', d)} \ | 94 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium virgl', '', d)} \ |
93 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ | 95 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ |
@@ -114,16 +116,16 @@ DRIDRIVERS_class-nativesdk = "swrast" | |||
114 | DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" | 116 | DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" |
115 | DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" | 117 | DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" |
116 | # "dri" requires "opengl" | 118 | # "dri" requires "opengl" |
117 | PACKAGECONFIG[dri] = "-Ddri=true -Ddri-drivers=${DRIDRIVERS}, -Ddri=false -Ddri-drivers='', xorgproto libdrm" | 119 | PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')}, -Ddri-drivers='', xorgproto libdrm" |
118 | PACKAGECONFIG[dri3] = "-Ddri3=true, -Ddri3=false, xorgproto libxshmfence" | 120 | PACKAGECONFIG[dri3] = "-Ddri3=true, -Ddri3=false, xorgproto libxshmfence" |
119 | 121 | ||
120 | # Vulkan drivers need dri3 enabled | 122 | # Vulkan drivers need dri3 enabled |
121 | # radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9 | 123 | # amd could be enabled as well but requires gallium-llvm with llvm >= 3.9 |
122 | VULKAN_DRIVERS = "" | 124 | VULKAN_DRIVERS = "" |
123 | VULKAN_DRIVERS_append_x86_class-target = ",intel" | 125 | VULKAN_DRIVERS_append_x86_class-target = ",intel" |
124 | VULKAN_DRIVERS_append_x86-64_class-target = ",intel" | 126 | VULKAN_DRIVERS_append_x86-64_class-target = ",intel" |
125 | VULKAN_DRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" | 127 | VULKAN_DRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" |
126 | PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${VULKAN_DRIVERS}, -Dvulkan-drivers=''," | 128 | PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers=''," |
127 | 129 | ||
128 | PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" | 130 | PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" |
129 | 131 | ||
@@ -150,9 +152,8 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', | |||
150 | GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '', d)}" | 152 | GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '', d)}" |
151 | 153 | ||
152 | # radeonsi requires LLVM | 154 | # radeonsi requires LLVM |
153 | GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" | 155 | GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" |
154 | GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" | 156 | GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${GALLIUMDRIVERS_RADEONSI}" |
155 | GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" | ||
156 | 157 | ||
157 | PACKAGECONFIG[r600] = "" | 158 | PACKAGECONFIG[r600] = "" |
158 | PACKAGECONFIG[virgl] = "" | 159 | PACKAGECONFIG[virgl] = "" |
@@ -161,9 +162,9 @@ GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ' | |||
161 | GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}" | 162 | GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}" |
162 | GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" | 163 | GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" |
163 | 164 | ||
164 | PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS}, -Dgallium-drivers=''" | 165 | PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers=''" |
165 | PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \ | 166 | PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \ |
166 | ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" | 167 | elfutils" |
167 | PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" | 168 | PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" |
168 | PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial" | 169 | PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial" |
169 | 170 | ||