diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-01-13 15:56:56 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-15 08:49:08 +0000 |
| commit | 256173b0245dda1c8cb7c6dee5d97c77a2650726 (patch) | |
| tree | 8ba324933df17a39eca8f69eef62ac5ccbf4e318 /meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | |
| parent | e6715606f3b2842288791fccc14f4836a04bdd5d (diff) | |
| download | poky-256173b0245dda1c8cb7c6dee5d97c77a2650726.tar.gz | |
mesa: update 22.2.3 -> 22.3.3
gallium-xvmc option removed upstream
Remove 0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch
as upstream code no longer uses these definitions.
(From OE-Core rev: 3bf4341ef6a681574a1c6f393bf241f412e26eac)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch')
| -rw-r--r-- | meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index ec263ce479..36c33f889b 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From d092a9000da62dfccca5b58fca56b94eb9989c48 Mon Sep 17 00:00:00 2001 | 1 | From 3b4d6b89f644b43e507c08181fef06db4326f9da Mon Sep 17 00:00:00 2001 |
| 2 | From: Alistair Francis <alistair@alistair23.me> | 2 | From: Alistair Francis <alistair@alistair23.me> |
| 3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 | 3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 |
| 4 | Subject: [PATCH] meson.build: check for all linux host_os combinations | 4 | Subject: [PATCH] meson.build: check for all linux host_os combinations |
| @@ -20,19 +20,19 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me> | |||
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 21 | 21 | ||
| 22 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
| 23 | index 250b528..b5c98f8 100644 | 23 | index 172c64a..9b5294c 100644 |
| 24 | --- a/meson.build | 24 | --- a/meson.build |
| 25 | +++ b/meson.build | 25 | +++ b/meson.build |
| 26 | @@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 | 26 | @@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 |
| 27 | # Only build shared_glapi if at least one OpenGL API is enabled | 27 | # Only build shared_glapi if at least one OpenGL API is enabled |
| 28 | with_shared_glapi = with_shared_glapi and with_any_opengl | 28 | with_shared_glapi = with_shared_glapi and with_any_opengl |
| 29 | 29 | ||
| 30 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system()) | 30 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) |
| 31 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') | 31 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
| 32 | 32 | ||
| 33 | dri_drivers = get_option('dri-drivers') | 33 | with_freedreno_kgsl = get_option('freedreno-kgsl') |
| 34 | if dri_drivers.length() != 0 | 34 | if with_freedreno_kgsl |
| 35 | @@ -1091,7 +1091,7 @@ if cc.has_function('reallocarray') | 35 | @@ -1076,7 +1076,7 @@ if cc.has_function('reallocarray') |
| 36 | endif | 36 | endif |
| 37 | 37 | ||
| 38 | # TODO: this is very incomplete | 38 | # TODO: this is very incomplete |