summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2020-12-17 23:52:45 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-24 08:25:14 +0000
commita482c780adc24e23d93297ef24ea721787dcecc8 (patch)
tree5f1c6b38eb8f7e6df2ead7660f6fdc31bc1fa1c0
parentbbb16e57f8917458cd1d96c0a90f1d9dc4885c73 (diff)
downloadpoky-a482c780adc24e23d93297ef24ea721787dcecc8.tar.gz
mesa: update 20.2.4 -> 20.3.1
Two of the patches have been applied upstream: 0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch 0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch The 'surfaceless' platform is now enabled by default, therefore it is no longer a valid choice. The meson build system is intelligent enough now to decide if 'drm' needs to be enabled based on whether or not gbm is available. Therefore 'drm' also is no longer a valid platform choice: ERROR: Options "drm, surfaceless" are not in allowed choices: "auto, x11, wayland, haiku, android, windows" RP: Add missing mesa-gl upgrade (From OE-Core rev: de68fe9268092c0600a81bedfc805eaed9dcb87b) Signed-off-by: Trevor Woerner <twoerner@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch51
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc8
-rw-r--r--meta/recipes-graphics/mesa/mesa_20.3.1.bb (renamed from meta/recipes-graphics/mesa/mesa_20.2.4.bb)0
5 files changed, 2 insertions, 93 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
deleted file mode 100644
index 9ee72880a2..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch
+++ /dev/null
@@ -1,36 +0,0 @@
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/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch b/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
deleted file mode 100644
index dacb1ea1c8..0000000000
--- a/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 281a636353666bfdd373c62591e744087e750e89 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 4 Dec 2019 14:15:28 -0800
4Subject: [PATCH] vc4: use intmax_t for formatted output of timespec members
5
632bit architectures which have 64bit time_t does not fit the assumption
7of time_t being same as system long int
8
9Fixes
10error: format specifies type 'long' but the argument has type 'time_t' (aka 'long long') [-Werror,-Wformat]
11 time.tv_sec);
12 ^~~~~~~~~~~
13
14Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2966]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16
17---
18 src/gallium/drivers/v3d/v3d_bufmgr.c | 4 ++--
19 src/gallium/drivers/vc4/vc4_bufmgr.c | 4 ++--
20 2 files changed, 4 insertions(+), 4 deletions(-)
21
22diff --git a/src/gallium/drivers/v3d/v3d_bufmgr.c b/src/gallium/drivers/v3d/v3d_bufmgr.c
23index 31a0803..cc2e2af 100644
24--- a/src/gallium/drivers/v3d/v3d_bufmgr.c
25+++ b/src/gallium/drivers/v3d/v3d_bufmgr.c
26@@ -80,8 +80,8 @@ v3d_bo_dump_stats(struct v3d_screen *screen)
27
28 struct timespec time;
29 clock_gettime(CLOCK_MONOTONIC, &time);
30- fprintf(stderr, " now: %ld\n",
31- (long)time.tv_sec);
32+ fprintf(stderr, " now: %jd\n",
33+ (intmax_t)time.tv_sec);
34 }
35 }
36
37diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c
38index a786e8e..975d49e 100644
39--- a/src/gallium/drivers/vc4/vc4_bufmgr.c
40+++ b/src/gallium/drivers/vc4/vc4_bufmgr.c
41@@ -99,8 +99,8 @@ vc4_bo_dump_stats(struct vc4_screen *screen)
42
43 struct timespec time;
44 clock_gettime(CLOCK_MONOTONIC, &time);
45- fprintf(stderr, " now: %ld\n",
46- (long)time.tv_sec);
47+ fprintf(stderr, " now: %jd\n",
48+ (intmax_t)time.tv_sec);
49 }
50 }
51
diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb b/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb
index e50782be1c..e50782be1c 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 011abe6e95..883c244471 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -17,14 +17,12 @@ PE = "2"
17SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ 17SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
18 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ 18 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
19 file://0002-meson.build-make-TLS-ELF-optional.patch \ 19 file://0002-meson.build-make-TLS-ELF-optional.patch \
20 file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
21 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ 20 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
22 file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ 21 file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
23 file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ 22 file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \
24 file://0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch \
25 " 23 "
26 24
27SRC_URI[sha256sum] = "0572dc6015d2e1c50f67823edd16855ae9b6feded0a1470598404e75e64aa092" 25SRC_URI[sha256sum] = "af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f"
28 26
29UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 27UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
30 28
@@ -52,9 +50,7 @@ BBCLASSEXTEND = "native nativesdk"
52 50
53ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" 51ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan"
54 52
55PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \ 53PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}"
56 ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \
57 surfaceless"
58 54
59export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config" 55export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config"
60export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}" 56export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}"
diff --git a/meta/recipes-graphics/mesa/mesa_20.2.4.bb b/meta/recipes-graphics/mesa/mesa_20.3.1.bb
index 96e8aa38d6..96e8aa38d6 100644
--- a/meta/recipes-graphics/mesa/mesa_20.2.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_20.3.1.bb