diff options
author | Trevor Woerner <twoerner@gmail.com> | 2020-12-17 23:52:45 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-24 08:25:14 +0000 |
commit | a482c780adc24e23d93297ef24ea721787dcecc8 (patch) | |
tree | 5f1c6b38eb8f7e6df2ead7660f6fdc31bc1fa1c0 /meta/recipes-graphics/mesa/mesa.inc | |
parent | bbb16e57f8917458cd1d96c0a90f1d9dc4885c73 (diff) | |
download | poky-a482c780adc24e23d93297ef24ea721787dcecc8.tar.gz |
mesa: update 20.2.4 -> 20.3.1
Two of the patches have been applied upstream:
0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch
0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
The 'surfaceless' platform is now enabled by default, therefore it is no
longer a valid choice. The meson build system is intelligent enough now to
decide if 'drm' needs to be enabled based on whether or not gbm is available.
Therefore 'drm' also is no longer a valid platform choice:
ERROR: Options "drm, surfaceless" are not in allowed choices: "auto, x11, wayland, haiku, android, windows"
RP: Add missing mesa-gl upgrade
(From OE-Core rev: de68fe9268092c0600a81bedfc805eaed9dcb87b)
Signed-off-by: Trevor Woerner <twoerner@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 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 011abe6e95..883c244471 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -17,14 +17,12 @@ PE = "2" | |||
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://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ | ||
21 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 20 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
22 | file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ | 21 | file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ |
23 | file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ | 22 | file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ |
24 | file://0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch \ | ||
25 | " | 23 | " |
26 | 24 | ||
27 | SRC_URI[sha256sum] = "0572dc6015d2e1c50f67823edd16855ae9b6feded0a1470598404e75e64aa092" | 25 | SRC_URI[sha256sum] = "af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f" |
28 | 26 | ||
29 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
30 | 28 | ||
@@ -52,9 +50,7 @@ BBCLASSEXTEND = "native nativesdk" | |||
52 | 50 | ||
53 | ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" | 51 | ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" |
54 | 52 | ||
55 | PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \ | 53 | PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" |
56 | ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \ | ||
57 | surfaceless" | ||
58 | 54 | ||
59 | export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config" | 55 | export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config" |
60 | export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}" | 56 | export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}" |