diff options
author | Fabio Berton <fabio.berton@ossystems.com.br> | 2019-05-15 18:22:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-16 09:16:50 +0100 |
commit | e47715708729fe3fed2c5bcafa06f5f1c84f302f (patch) | |
tree | 708f428a746a6be67482f0b0bb2640a8b40d5b3a /meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | |
parent | 9095dc153a760a4336260419aa2298fad8d7d031 (diff) | |
download | poky-e47715708729fe3fed2c5bcafa06f5f1c84f302f.tar.gz |
mesa: Convert recipe to use meson build system
- Remove all non related meson patches
- Change radeon driver to r100
- Add python3-mako-native gettext-native to DEPENDS
Based on https://patchwork.openembedded.org/patch/158748/
Alex: added a patch to restore glx-tls option, which
addresses the musl runtime issue.
(From OE-Core rev: c72b6d46d392bfbcf54154f43663a7a8ada8c567)
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
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/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 | 51 |
1 files changed, 51 insertions, 0 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 new file mode 100644 index 0000000000..61e24c6e9f --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 498f230c9446fc7a1b4dc77ff6b84ee1a3b53bf4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | ||
3 | Date: Wed, 24 Apr 2019 17:01:24 -0300 | ||
4 | Subject: [PATCH] meson.build: check for all linux host_os combinations | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | Make sure that we are also looking for our host_os combinations like | ||
8 | linux-musl etc. when assuming support for DRM/KMS. | ||
9 | |||
10 | Also delete a duplicate line. | ||
11 | |||
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
13 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
14 | --- | ||
15 | meson.build | 6 +++--- | ||
16 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/meson.build b/meson.build | ||
19 | index 53d02e31097..c41f6b4e402 100644 | ||
20 | --- a/meson.build | ||
21 | +++ b/meson.build | ||
22 | @@ -34,6 +34,8 @@ cpp = meson.get_compiler('cpp') | ||
23 | |||
24 | null_dep = dependency('', required : false) | ||
25 | |||
26 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') | ||
27 | + | ||
28 | # Arguments for the preprocessor, put these in a separate array from the C and | ||
29 | # C++ (cpp in meson terminology) arguments since they need to be added to the | ||
30 | # default arguments for both C and C++. | ||
31 | @@ -89,8 +91,6 @@ if (with_gles1 or with_gles2) and not with_opengl | ||
32 | error('building OpenGL ES without OpenGL is not supported.') | ||
33 | endif | ||
34 | |||
35 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) | ||
36 | - | ||
37 | _drivers = get_option('dri-drivers') | ||
38 | if _drivers.contains('auto') | ||
39 | if system_has_kms_drm | ||
40 | @@ -792,7 +792,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', | ||
41 | endif | ||
42 | |||
43 | # TODO: this is very incomplete | ||
44 | -if ['linux', 'cygwin', 'gnu'].contains(host_machine.system()) | ||
45 | +if ['cygwin', 'gnu'].contains(host_machine.system()) or host_machine.system().startswith('linux') | ||
46 | pre_args += '-D_GNU_SOURCE' | ||
47 | endif | ||
48 | |||
49 | -- | ||
50 | 2.21.0 | ||
51 | |||