summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2020-11-12 15:37:46 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-13 14:32:00 +0000
commit0e826df574185b842a316a232da61a34c1bc45e1 (patch)
tree6dd26b794c14fb5cab2af8d3310470b9e5ae859a /meta/recipes-graphics
parent9c06fbbbee2183e9e1285496d00282dde59eb538 (diff)
downloadpoky-0e826df574185b842a316a232da61a34c1bc45e1.tar.gz
mesa: Add xcb-fixes to loader when using x11 and dri3
Backport fix for undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c. (From OE-Core rev: fd55d41c9d2e79fd7f7665107d1640a2dd9a3dc3) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch36
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch b/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch
new file mode 100644
index 0000000000..9ee72880a2
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch
@@ -0,0 +1,36 @@
1From cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c Mon Sep 17 00:00:00 2001
2From: Duncan Hopkins <duncan@duncanhopkins.me.uk>
3Date: Thu, 15 Oct 2020 12:14:57 +0100
4Subject: [PATCH] meson: Add xcb-fixes to loader when using x11 and dri3. Fixes
5 undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c
6
7loader_dr3_helper.c uses xcb_xfixes_create_region() that requires dep_xcb_xfixes to link. This is dependent on with_platform_x11 and with_dri3.
8But the source meson file does not set this up dependent on with_dri3.
9The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast.
10
11Reviewed-by: Eric Anholt <eric@anholt.net>
12Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7164>
13
14Upstream-Status: Backport [cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c]
15
16---
17 meson.build | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-)
19
20diff --git a/meson.build b/meson.build
21index cfe02fa6373..3cb3c904927 100644
22--- a/meson.build
23+++ b/meson.build
24@@ -1782,7 +1782,8 @@ if with_platform_x11
25 dep_xxf86vm = dependency('xxf86vm')
26 endif
27 endif
28- if (with_egl or (
29+ if (with_egl or
30+ with_dri3 or (
31 with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or
32 with_gallium_omx != 'disabled'))
33 dep_xcb_xfixes = dependency('xcb-xfixes')
34--
352.17.1
36
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 5a6caf2662..ca593b8b1f 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -22,6 +22,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
22 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ 22 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
23 file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ 23 file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
24 file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ 24 file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \
25 file://0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch \
25 " 26 "
26 27
27SRC_URI[sha256sum] = "d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a" 28SRC_URI[sha256sum] = "d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a"