summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch45
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa_19.0.3.bb1
3 files changed, 47 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch b/meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch
new file mode 100644
index 0000000000..52d670a296
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch
@@ -0,0 +1,45 @@
1From 8e0a58c8eea7ed70071cac139655700fdfa16445 Mon Sep 17 00:00:00 2001
2From: Andrei Gherzan <andrei@gherzan.ro>
3Date: Wed, 22 May 2019 18:32:07 +0100
4Subject: [PATCH] Allow enable DRI without DRI drivers
5
6Upstream-status: Pending
7Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
8---
9 meson.build | 2 +-
10 meson_options.txt | 6 ++++++
11 2 files changed, 7 insertions(+), 1 deletion(-)
12
13diff --git a/meson.build b/meson.build
14index 53d02e3..9a8578f 100644
15--- a/meson.build
16+++ b/meson.build
17@@ -119,7 +119,7 @@ with_dri_r200 = _drivers.contains('r200')
18 with_dri_nouveau = _drivers.contains('nouveau')
19 with_dri_swrast = _drivers.contains('swrast')
20
21-with_dri = _drivers.length() != 0 and _drivers != ['']
22+with_dri = get_option('dri') or (_drivers.length() != 0 and _drivers != [''])
23
24 _drivers = get_option('gallium-drivers')
25 if _drivers.contains('auto')
26diff --git a/meson_options.txt b/meson_options.txt
27index ccf7065..5174320 100644
28--- a/meson_options.txt
29+++ b/meson_options.txt
30@@ -34,6 +34,12 @@ option(
31 choices : ['auto', 'true', 'false'],
32 description : 'enable support for dri3'
33 )
34+option(
35+ 'dri',
36+ type : 'boolean',
37+ value : false,
38+ description : 'enable support for dri'
39+)
40 option(
41 'dri-drivers',
42 type : 'array',
43--
442.17.1
45
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index cd3ddfd822..3ecfb8506c 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -70,7 +70,7 @@ DRIDRIVERS_class-nativesdk = "swrast"
70DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" 70DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915"
71DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" 71DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915"
72# "dri" requires "opengl" 72# "dri" requires "opengl"
73PACKAGECONFIG[dri] = "-Ddri-drivers=${DRIDRIVERS}, -Ddri-drivers='', xorgproto libdrm" 73PACKAGECONFIG[dri] = "-Ddri=true -Ddri-drivers=${DRIDRIVERS}, -Ddri=false -Ddri-drivers='', xorgproto libdrm"
74PACKAGECONFIG[dri3] = "-Ddri3=true, -Ddri3=false, xorgproto libxshmfence" 74PACKAGECONFIG[dri3] = "-Ddri3=true, -Ddri3=false, xorgproto libxshmfence"
75 75
76# Vulkan drivers need dri3 enabled 76# Vulkan drivers need dri3 enabled
diff --git a/meta/recipes-graphics/mesa/mesa_19.0.3.bb b/meta/recipes-graphics/mesa/mesa_19.0.3.bb
index 36faa4a99d..8a72df1014 100644
--- a/meta/recipes-graphics/mesa/mesa_19.0.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_19.0.3.bb
@@ -3,6 +3,7 @@ require ${BPN}.inc
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://0001-meson.build-make-TLS-GLX-optional-again.patch \
6 file://0001-Allow-enable-DRI-without-DRI-drivers.patch \
6 " 7 "
7 8
8SRC_URI[md5sum] = "d03bf14e42c0e54ebae5730712ccc408" 9SRC_URI[md5sum] = "d03bf14e42c0e54ebae5730712ccc408"