diff options
author | Alistair Francis <alistair@alistair23.me> | 2019-11-14 12:22:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-21 23:08:19 +0000 |
commit | ed3079a7351c5f7bef9018b47cdc0f6c313f1a1c (patch) | |
tree | 41f47ae727cdeff0c91d8c0bf7045dc53651cb98 /meta/recipes-graphics/mesa/mesa.inc | |
parent | b8c34f9a241b9d79907c5022d67600630e8ed430 (diff) | |
download | poky-ed3079a7351c5f7bef9018b47cdc0f6c313f1a1c.tar.gz |
mesa: Upgrade to 19.2.4
Upgrade mesa and mesa-gl to 19.2.4.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file. It has been replaced with 'use-elf-tls' instead.
I have backported the asm removal as an attempt to fix the musl build
issue.
(From OE-Core rev: 82c2acc1f658f039becac04aa3dae696418bd1de)
Signed-off-by: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Alistair Francis <alistair.francis@wdc.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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index bf1492b422..5838207e6b 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -10,7 +10,7 @@ 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=725f991a1cc322aa7a0cd3a2016621c4" | 13 | LIC_FILES_CHKSUM = "file://docs/license.html;md5=3a4999caf82cc503ac8b9e37c235782e" |
14 | 14 | ||
15 | PE = "2" | 15 | PE = "2" |
16 | 16 | ||
@@ -57,12 +57,12 @@ PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland v | |||
57 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium', '', d)} \ | 57 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium', '', d)} \ |
58 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ | 58 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ |
59 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ | 59 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ |
60 | glx-tls \ | 60 | elf-tls \ |
61 | " | 61 | " |
62 | PACKAGECONFIG_class-native ?= "gbm dri egl opengl glx-tls" | 62 | PACKAGECONFIG_class-native ?= "gbm dri egl opengl elf-tls" |
63 | PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl glx-tls" | 63 | PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl elf-tls" |
64 | 64 | ||
65 | PACKAGECONFIG_remove_libc-musl = "glx-tls" | 65 | PACKAGECONFIG_remove_libc-musl = "elf-tls" |
66 | 66 | ||
67 | # "gbm" requires "dri", "opengl" | 67 | # "gbm" requires "dri", "opengl" |
68 | PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false" | 68 | PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false" |
@@ -70,7 +70,7 @@ PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false" | |||
70 | X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" | 70 | X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" |
71 | # "x11" requires "opengl" | 71 | # "x11" requires "opengl" |
72 | PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" | 72 | PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" |
73 | PACKAGECONFIG[glx-tls] = "-Dglx-tls=true, -Dglx-tls=false" | 73 | PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false" |
74 | PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=true,-Dgallium-xvmc=false,libxvmc" | 74 | PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=true,-Dgallium-xvmc=false,libxvmc" |
75 | PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" | 75 | PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" |
76 | 76 | ||