diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch b/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch index b5658d0c9d..8d614e571a 100644 --- a/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch +++ b/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1b1cb6e5ea25eaa98573328b9565728a08245997 Mon Sep 17 00:00:00 2001 | 1 | From 41cd8836d785c79381764e7de59319f87959a5cf 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 09:06:02 -0800 | 3 | Date: Thu, 14 Nov 2019 09:06:02 -0800 |
4 | Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now that | 4 | Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now that |
@@ -15,7 +15,7 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me> | |||
15 | 2 files changed, 67 insertions(+), 33 deletions(-) | 15 | 2 files changed, 67 insertions(+), 33 deletions(-) |
16 | 16 | ||
17 | diff --git a/meson.build b/meson.build | 17 | diff --git a/meson.build b/meson.build |
18 | index 512eec6..a2bcc3a 100644 | 18 | index 62864c6..b53be8d 100644 |
19 | --- a/meson.build | 19 | --- a/meson.build |
20 | +++ b/meson.build | 20 | +++ b/meson.build |
21 | @@ -49,6 +49,7 @@ with_vulkan_icd_dir = get_option('vulkan-icd-dir') | 21 | @@ -49,6 +49,7 @@ with_vulkan_icd_dir = get_option('vulkan-icd-dir') |
@@ -26,7 +26,7 @@ index 512eec6..a2bcc3a 100644 | |||
26 | with_glx_read_only_text = get_option('glx-read-only-text') | 26 | with_glx_read_only_text = get_option('glx-read-only-text') |
27 | with_glx_direct = get_option('glx-direct') | 27 | with_glx_direct = get_option('glx-direct') |
28 | with_osmesa = get_option('osmesa') | 28 | with_osmesa = get_option('osmesa') |
29 | @@ -985,41 +986,68 @@ endif | 29 | @@ -1093,41 +1094,68 @@ dep_ws2_32 = cc.find_library('ws2_32', required : with_platform_windows) |
30 | 30 | ||
31 | # TODO: shared/static? Is this even worth doing? | 31 | # TODO: shared/static? Is this even worth doing? |
32 | 32 | ||
@@ -129,10 +129,10 @@ index 512eec6..a2bcc3a 100644 | |||
129 | endif | 129 | endif |
130 | 130 | ||
131 | diff --git a/meson_options.txt b/meson_options.txt | 131 | diff --git a/meson_options.txt b/meson_options.txt |
132 | index a8abd04..0f4bd80 100644 | 132 | index 700c34c..62e8472 100644 |
133 | --- a/meson_options.txt | 133 | --- a/meson_options.txt |
134 | +++ b/meson_options.txt | 134 | +++ b/meson_options.txt |
135 | @@ -233,6 +233,12 @@ option( | 135 | @@ -241,6 +241,12 @@ option( |
136 | value : false, | 136 | value : false, |
137 | description : 'Enable GLVND support.' | 137 | description : 'Enable GLVND support.' |
138 | ) | 138 | ) |