summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2019-06-12 18:12:57 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-14 22:48:22 +0100
commit2e395d80534dc0914989d81d51160fc34be3a2ec (patch)
tree95c860744881295d8417adb2aeb2d0920c0bbacc /meta/recipes-graphics/mesa
parentb87f4d28f925891b2e9473cfac0d0885748f7f4f (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch25
-rw-r--r--meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch (renamed from meta/recipes-graphics/mesa/files/0001-meson.build-make-TLS-GLX-optional-again.patch)30
-rw-r--r--meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch (renamed from meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch)29
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_19.1.0.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_19.0.6.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa_19.1.0.bb (renamed from meta/recipes-graphics/mesa/mesa_19.0.6.bb)8
5 files changed, 53 insertions, 39 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 @@
1From 498f230c9446fc7a1b4dc77ff6b84ee1a3b53bf4 Mon Sep 17 00:00:00 2001 1From da6b9188f29942684d4262f0c6264d09bb6fe7de Mon Sep 17 00:00:00 2001
2From: Fabio Berton <fabio.berton@ossystems.com.br> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 24 Apr 2019 17:01:24 -0300 3Date: Wed, 12 Jun 2019 13:40:20 -0300
4Subject: [PATCH] meson.build: check for all linux host_os combinations 4Subject: [PATCH 1/3] meson.build: check for all linux host_os combinations
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7Make sure that we are also looking for our host_os combinations like 7Make 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
10Also delete a duplicate line. 10Also delete a duplicate line.
11 11
12Upstream-Status: Pending
13
12Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 14Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> 15Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
14Upstream-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
19diff --git a/meson.build b/meson.build 20diff --git a/meson.build b/meson.build
20index 53d02e31097..c41f6b4e402 100644 21index 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--
512.21.0 522.22.0
52 53
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-make-TLS-GLX-optional-again.patch b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
index 8fabafcb35..81454aaa29 100644
--- a/meta/recipes-graphics/mesa/files/0001-meson.build-make-TLS-GLX-optional-again.patch
+++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
@@ -1,23 +1,26 @@
1From 48318f1a5c9042a8e1bb4456c2584362b25c4a59 Mon Sep 17 00:00:00 2001 1From d31718999797ffc4dd177d14760ef7b8fd95ac2f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 15 May 2019 17:21:51 +0200 3Date: Wed, 12 Jun 2019 14:15:57 -0300
4Subject: [PATCH] meson.build: make TLS GLX optional again 4Subject: [PATCH 2/3] meson.build: make TLS GLX optional again
5Organization: O.S. Systems Software LTDA.
5 6
6This was optional with autotools, and needs to be disabled 7This was optional with autotools, and needs to be disabled
7when using musl C library, for instance. 8when using musl C library, for instance.
8 9
9Upstream-Status: Pending 10Upstream-Status: Pending
11
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
11--- 14---
12 meson.build | 4 +++- 15 meson.build | 4 +++-
13 meson_options.txt | 6 ++++++ 16 meson_options.txt | 7 +++++++
14 2 files changed, 9 insertions(+), 1 deletion(-) 17 2 files changed, 10 insertions(+), 1 deletion(-)
15 18
16diff --git a/meson.build b/meson.build 19diff --git a/meson.build b/meson.build
17index c41f6b4..8843f3c 100644 20index e11880f2902..7a07974ba61 100644
18--- a/meson.build 21--- a/meson.build
19+++ b/meson.build 22+++ b/meson.build
20@@ -336,7 +336,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless) 23@@ -362,7 +362,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
21 endif 24 endif
22 endif 25 endif
23 26
@@ -29,10 +32,10 @@ index c41f6b4..8843f3c 100644
29 if not (with_platform_x11 and with_any_opengl) 32 if not (with_platform_x11 and with_any_opengl)
30 error('Cannot build GLX support without X11 platform support and at least one OpenGL API') 33 error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
31diff --git a/meson_options.txt b/meson_options.txt 34diff --git a/meson_options.txt b/meson_options.txt
32index ccf7065..0f1e800 100644 35index 1f72faabee8..fcd49efea27 100644
33--- a/meson_options.txt 36--- a/meson_options.txt
34+++ b/meson_options.txt 37+++ b/meson_options.txt
35@@ -324,3 +324,9 @@ option( 38@@ -339,6 +339,13 @@ option(
36 value : true, 39 value : true,
37 description : 'Enable direct rendering in GLX and EGL for DRI', 40 description : 'Enable direct rendering in GLX and EGL for DRI',
38 ) 41 )
@@ -42,3 +45,10 @@ index ccf7065..0f1e800 100644
42+ value : true, 45+ value : true,
43+ description : 'Enable TLS support in GLX', 46+ description : 'Enable TLS support in GLX',
44+) 47+)
48+
49 option(
50 'I-love-half-baked-turnips',
51 type : 'boolean',
52--
532.22.0
54
diff --git a/meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
index 4b9220aa30..0f254a1d91 100644
--- a/meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch
+++ b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
@@ -1,30 +1,33 @@
1From 8e0a58c8eea7ed70071cac139655700fdfa16445 Mon Sep 17 00:00:00 2001 1From 417ff3a03313aa003244990ed5c0188c421e6181 Mon Sep 17 00:00:00 2001
2From: Andrei Gherzan <andrei@gherzan.ro> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 22 May 2019 18:32:07 +0100 3Date: Wed, 12 Jun 2019 14:18:31 -0300
4Subject: [PATCH] Allow enable DRI without DRI drivers 4Subject: [PATCH 3/3] Allow enable DRI without DRI drivers
5Organization: O.S. Systems Software LTDA.
5 6
6Upstream-Status: Pending 7Upstream-Status: Pending
8
7Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
10Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
8--- 11---
9 meson.build | 2 +- 12 meson.build | 2 +-
10 meson_options.txt | 6 ++++++ 13 meson_options.txt | 6 ++++++
11 2 files changed, 7 insertions(+), 1 deletion(-) 14 2 files changed, 7 insertions(+), 1 deletion(-)
12 15
13diff --git a/meson.build b/meson.build 16diff --git a/meson.build b/meson.build
14index 53d02e3..9a8578f 100644 17index 7a07974ba61..5c7cbe38376 100644
15--- a/meson.build 18--- a/meson.build
16+++ b/meson.build 19+++ b/meson.build
17@@ -119,7 +119,7 @@ with_dri_r200 = _drivers.contains('r200') 20@@ -137,7 +137,7 @@ with_dri_r200 = dri_drivers.contains('r200')
18 with_dri_nouveau = _drivers.contains('nouveau') 21 with_dri_nouveau = dri_drivers.contains('nouveau')
19 with_dri_swrast = _drivers.contains('swrast') 22 with_dri_swrast = dri_drivers.contains('swrast')
20 23
21-with_dri = _drivers.length() != 0 and _drivers != [''] 24-with_dri = dri_drivers.length() != 0 and dri_drivers != ['']
22+with_dri = get_option('dri') or (_drivers.length() != 0 and _drivers != ['']) 25+with_dri = get_option('dri') or (_drivers.length() != 0 and _drivers != [''])
23 26
24 _drivers = get_option('gallium-drivers') 27 gallium_drivers = get_option('gallium-drivers')
25 if _drivers.contains('auto') 28 if gallium_drivers.contains('auto')
26diff --git a/meson_options.txt b/meson_options.txt 29diff --git a/meson_options.txt b/meson_options.txt
27index ccf7065..5174320 100644 30index fcd49efea27..0529200b3bb 100644
28--- a/meson_options.txt 31--- a/meson_options.txt
29+++ b/meson_options.txt 32+++ b/meson_options.txt
30@@ -34,6 +34,12 @@ option( 33@@ -34,6 +34,12 @@ option(
@@ -41,5 +44,5 @@ index ccf7065..5174320 100644
41 'dri-drivers', 44 'dri-drivers',
42 type : 'array', 45 type : 'array',
43-- 46--
442.17.1 472.22.0
45 48
diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.0.6.bb b/meta/recipes-graphics/mesa/mesa-gl_19.1.0.bb
index d4b1c1c454..d4b1c1c454 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_19.0.6.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_19.1.0.bb
diff --git a/meta/recipes-graphics/mesa/mesa_19.0.6.bb b/meta/recipes-graphics/mesa/mesa_19.1.0.bb
index 02e2c86dde..05c315349c 100644
--- a/meta/recipes-graphics/mesa/mesa_19.0.6.bb
+++ b/meta/recipes-graphics/mesa/mesa_19.1.0.bb
@@ -2,12 +2,12 @@ require ${BPN}.inc
2 2
3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ 3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
4 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ 4 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
5 file://0001-meson.build-make-TLS-GLX-optional-again.patch \ 5 file://0002-meson.build-make-TLS-GLX-optional-again.patch \
6 file://0001-Allow-enable-DRI-without-DRI-drivers.patch \ 6 file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
7 " 7 "
8 8
9SRC_URI[md5sum] = "b97159690eba564311d88a818bdbd64d" 9SRC_URI[md5sum] = "090cd351cf938fc1729dee983520216a"
10SRC_URI[sha256sum] = "2db2f2fcaa4048b16e066fad76b8a93944f7d06d329972b0f5fd5ce692ce3d24" 10SRC_URI[sha256sum] = "2a6c3af3a803389183168e449c536304cf03e0f82c4c9333077933543b9d02f3"
11 11
12#because we cannot rely on the fact that all apps will use pkgconfig, 12#because we cannot rely on the fact that all apps will use pkgconfig,
13#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 13#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER