diff options
author | Fabio Berton <fabio.berton@ossystems.com.br> | 2019-06-12 18:12:57 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-14 22:48:22 +0100 |
commit | 2e395d80534dc0914989d81d51160fc34be3a2ec (patch) | |
tree | 95c860744881295d8417adb2aeb2d0920c0bbacc /meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | |
parent | b87f4d28f925891b2e9473cfac0d0885748f7f4f (diff) | |
download | poky-2e395d80534dc0914989d81d51160fc34be3a2ec.tar.gz |
mesa: Update 19.0.6 -> 19.1.0
Update all patches to apply on 19.1.0 version.
See full mesa 19.0.1 changes here:
- https://www.mesa3d.org/relnotes/19.1.0.html
(From OE-Core rev: b16c6d0452c79dcc2fccc4a7b9b2d68d53d2b353)
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
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 | 25 |
1 files changed, 13 insertions, 12 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 dfc67b83d9..0064dc643c 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,7 +1,7 @@ | |||
1 | From 498f230c9446fc7a1b4dc77ff6b84ee1a3b53bf4 Mon Sep 17 00:00:00 2001 | 1 | From da6b9188f29942684d4262f0c6264d09bb6fe7de Mon Sep 17 00:00:00 2001 |
2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | 2 | From: Fabio Berton <fabio.berton@ossystems.com.br> |
3 | Date: Wed, 24 Apr 2019 17:01:24 -0300 | 3 | Date: Wed, 12 Jun 2019 13:40:20 -0300 |
4 | Subject: [PATCH] meson.build: check for all linux host_os combinations | 4 | Subject: [PATCH 1/3] meson.build: check for all linux host_os combinations |
5 | Organization: O.S. Systems Software LTDA. | 5 | Organization: O.S. Systems Software LTDA. |
6 | 6 | ||
7 | Make sure that we are also looking for our host_os combinations like | 7 | Make sure that we are also looking for our host_os combinations like |
@@ -9,15 +9,16 @@ linux-musl etc. when assuming support for DRM/KMS. | |||
9 | 9 | ||
10 | Also delete a duplicate line. | 10 | Also delete a duplicate line. |
11 | 11 | ||
12 | Upstream-Status: Pending | ||
13 | |||
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
13 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | 15 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
14 | Upstream-Status: Pending | ||
15 | --- | 16 | --- |
16 | meson.build | 6 +++--- | 17 | meson.build | 6 +++--- |
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | 18 | 1 file changed, 3 insertions(+), 3 deletions(-) |
18 | 19 | ||
19 | diff --git a/meson.build b/meson.build | 20 | diff --git a/meson.build b/meson.build |
20 | index 53d02e31097..c41f6b4e402 100644 | 21 | index 8ab8a550f56..e11880f2902 100644 |
21 | --- a/meson.build | 22 | --- a/meson.build |
22 | +++ b/meson.build | 23 | +++ b/meson.build |
23 | @@ -34,6 +34,8 @@ cpp = meson.get_compiler('cpp') | 24 | @@ -34,6 +34,8 @@ cpp = meson.get_compiler('cpp') |
@@ -29,16 +30,16 @@ index 53d02e31097..c41f6b4e402 100644 | |||
29 | # Arguments for the preprocessor, put these in a separate array from the C and | 30 | # Arguments for the preprocessor, put these in a separate array from the C and |
30 | # C++ (cpp in meson terminology) arguments since they need to be added to the | 31 | # C++ (cpp in meson terminology) arguments since they need to be added to the |
31 | # default arguments for both C and C++. | 32 | # default arguments for both C and C++. |
32 | @@ -89,8 +91,6 @@ if (with_gles1 or with_gles2) and not with_opengl | 33 | @@ -107,8 +109,6 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 |
33 | error('building OpenGL ES without OpenGL is not supported.') | 34 | # Only build shared_glapi if at least one OpenGL API is enabled |
34 | endif | 35 | with_shared_glapi = get_option('shared-glapi') and with_any_opengl |
35 | 36 | ||
36 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) | 37 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) |
37 | - | 38 | - |
38 | _drivers = get_option('dri-drivers') | 39 | dri_drivers = get_option('dri-drivers') |
39 | if _drivers.contains('auto') | 40 | if dri_drivers.contains('auto') |
40 | if system_has_kms_drm | 41 | if system_has_kms_drm |
41 | @@ -792,7 +792,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', | 42 | @@ -836,7 +836,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', |
42 | endif | 43 | endif |
43 | 44 | ||
44 | # TODO: this is very incomplete | 45 | # TODO: this is very incomplete |
@@ -48,5 +49,5 @@ index 53d02e31097..c41f6b4e402 100644 | |||
48 | endif | 49 | endif |
49 | 50 | ||
50 | -- | 51 | -- |
51 | 2.21.0 | 52 | 2.22.0 |
52 | 53 | ||