diff options
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | 12 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_23.0.3.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_23.1.1.bb (renamed from meta/recipes-graphics/mesa/mesa_23.0.3.bb) | 0 |
4 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 36c33f889b..a555c5f865 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 3b4d6b89f644b43e507c08181fef06db4326f9da Mon Sep 17 00:00:00 2001 | 1 | From b251af67df5a6840d2e9cc06edae2c387f8778f1 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 172c64a..9b5294c 100644 | 23 | index 22385d8..15f48a6 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 | @@ -121,7 +121,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', 'android'].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', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].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 | with_freedreno_kgsl = get_option('freedreno-kgsl') | 33 | gallium_drivers = get_option('gallium-drivers') |
34 | if with_freedreno_kgsl | 34 | if gallium_drivers.contains('auto') |
35 | @@ -1076,7 +1076,7 @@ if cc.has_function('reallocarray') | 35 | @@ -909,7 +909,7 @@ if cc.has_function('fmemopen') |
36 | endif | 36 | endif |
37 | 37 | ||
38 | # TODO: this is very incomplete | 38 | # TODO: this is very incomplete |
diff --git a/meta/recipes-graphics/mesa/mesa-gl_23.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb index ca160f1bfc..ca160f1bfc 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_23.0.3.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 439389fb8a..ac42a8dd4f 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -19,7 +19,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | |||
19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI[sha256sum] = "386362a5d80df3b096636b67f340e1ce67b705b44767d5bdd11d2ed1037192d5" | 22 | SRC_URI[sha256sum] = "a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40" |
23 | 23 | ||
24 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 24 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
25 | 25 | ||
diff --git a/meta/recipes-graphics/mesa/mesa_23.0.3.bb b/meta/recipes-graphics/mesa/mesa_23.1.1.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/meta/recipes-graphics/mesa/mesa_23.0.3.bb +++ b/meta/recipes-graphics/mesa/mesa_23.1.1.bb | |||