summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
diff options
context:
space:
mode:
authorAlistair Francis <alistair@alistair23.me>2019-11-14 12:22:20 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-21 23:08:19 +0000
commited3079a7351c5f7bef9018b47cdc0f6c313f1a1c (patch)
tree41f47ae727cdeff0c91d8c0bf7045dc53651cb98 /meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
parentb8c34f9a241b9d79907c5022d67600630e8ed430 (diff)
downloadpoky-ed3079a7351c5f7bef9018b47cdc0f6c313f1a1c.tar.gz
mesa: Upgrade to 19.2.4
Upgrade mesa and mesa-gl to 19.2.4. The license hash change was a trivial new line removal. The glx-tls option was removed as it isn't included in the meson.build file. It has been replaced with 'use-elf-tls' instead. I have backported the asm removal as an attempt to fix the musl build issue. (From OE-Core rev: 82c2acc1f658f039becac04aa3dae696418bd1de) Signed-off-by: Alistair Francis <alistair@alistair23.me> Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch')
-rw-r--r--meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
index 346b217585..c20a1f7c52 100644
--- a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
+++ b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
@@ -1,24 +1,24 @@
1From f1482e88c2295b9c7288f5b273335a8e18039de8 Mon Sep 17 00:00:00 2001 1From 5ad6515238bc042cccf9959abad44fdee9aeb07f 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, 12 Jun 2019 14:18:31 -0300 3Date: Wed, 12 Jun 2019 14:18:31 -0300
4Subject: [PATCH] Allow enable DRI without DRI drivers 4Subject: [PATCH] Allow enable DRI without DRI drivers
5Organization: O.S. Systems Software LTDA.
6 5
7Upstream-Status: Pending 6Upstream-Status: Pending
8 7
9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 8Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
10Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> 9Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 10Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11
12--- 12---
13 meson.build | 2 +- 13 meson.build | 2 +-
14 meson_options.txt | 6 ++++++ 14 meson_options.txt | 6 ++++++
15 2 files changed, 7 insertions(+), 1 deletion(-) 15 2 files changed, 7 insertions(+), 1 deletion(-)
16 16
17diff --git a/meson.build b/meson.build 17diff --git a/meson.build b/meson.build
18index 0e50bb26c0a..de065c290d6 100644 18index 1e31eb4..512eec6 100644
19--- a/meson.build 19--- a/meson.build
20+++ b/meson.build 20+++ b/meson.build
21@@ -137,7 +137,7 @@ with_dri_r200 = dri_drivers.contains('r200') 21@@ -147,7 +147,7 @@ with_dri_r200 = dri_drivers.contains('r200')
22 with_dri_nouveau = dri_drivers.contains('nouveau') 22 with_dri_nouveau = dri_drivers.contains('nouveau')
23 with_dri_swrast = dri_drivers.contains('swrast') 23 with_dri_swrast = dri_drivers.contains('swrast')
24 24
@@ -28,7 +28,7 @@ index 0e50bb26c0a..de065c290d6 100644
28 gallium_drivers = get_option('gallium-drivers') 28 gallium_drivers = get_option('gallium-drivers')
29 if gallium_drivers.contains('auto') 29 if gallium_drivers.contains('auto')
30diff --git a/meson_options.txt b/meson_options.txt 30diff --git a/meson_options.txt b/meson_options.txt
31index fcd49efea27..0529200b3bb 100644 31index 76cef24..a8abd04 100644
32--- a/meson_options.txt 32--- a/meson_options.txt
33+++ b/meson_options.txt 33+++ b/meson_options.txt
34@@ -34,6 +34,12 @@ option( 34@@ -34,6 +34,12 @@ option(