Skip to contentSkip to conversation

mesa: update 20.2.4 → 20.3.1

PATCH In review Trevor Woerner 2 participants 3 messages Dec 18, 2020 – Dec 22, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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"

---
 ...xes-to-loader-when-using-x11-and-dri.patch | 36 -------------
 ...-for-formatted-output-of-timespec-me.patch | 51 -------------------
 meta/recipes-graphics/mesa/mesa.inc           |  8 +--
 .../mesa/{mesa_20.2.4.bb => mesa_20.3.1.bb}   |  0
 4 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch
 delete mode 100644 meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
 rename meta/recipes-graphics/mesa/{mesa_20.2.4.bb => mesa_20.3.1.bb} (100%)
meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch deleted +0 -36
deleted file mode 100644
index 9ee72880a2..0000000000
@@ -1,36 +0,0 @@
-From cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c Mon Sep 17 00:00:00 2001
-From: Duncan Hopkins <[email protected]>
-Date: Thu, 15 Oct 2020 12:14:57 +0100
-Subject: [PATCH] meson: Add xcb-fixes to loader when using x11 and dri3. Fixes
- undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c
-
-loader_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.
-But the source meson file does not set this up dependent on with_dri3.
-The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast.
-
-Reviewed-by: Eric Anholt <[email protected]>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7164>
-
-Upstream-Status: Backport [cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c]
-
----
- meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index cfe02fa6373..3cb3c904927 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1782,7 +1782,8 @@ if with_platform_x11
-       dep_xxf86vm = dependency('xxf86vm')
-     endif
-   endif
--  if (with_egl or (
-+  if (with_egl or 
-+      with_dri3 or (
-       with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or
-       with_gallium_omx != 'disabled'))
-     dep_xcb_xfixes = dependency('xcb-xfixes')
--- 
-2.17.1
-
meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch deleted +0 -51

51 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa.inc +2 -6
index dba23f586f..2158c9eaf9 100644
@@ -17,14 +17,12 @@ PE = "2"
 SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
            file://0002-meson.build-make-TLS-ELF-optional.patch \
-           file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
            file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \
-           file://0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch \
            "
 
-SRC_URI[sha256sum] = "0572dc6015d2e1c50f67823edd16855ae9b6feded0a1470598404e75e64aa092"
+SRC_URI[sha256sum] = "af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
@@ -52,9 +50,7 @@ BBCLASSEXTEND = "native nativesdk"
 
 ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan"
 
-PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \
-               ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \
-               surfaceless"
+PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}"
 
 export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config"
 export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}"
meta/recipes-graphics/mesa/mesa_20.3.1.bb renamed from meta/recipes-graphics/mesa/mesa_20.2.4.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_20.2.4.bb
rename to meta/recipes-graphics/mesa/mesa_20.3.1.bb
Signature · 1 line
2.30.0.rc0
#1 lore raw
Quoted 14 lines · Trevor Woerner

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:

Quoted 4 lines

        ERROR: Options "drm, surfaceless" are not in allowed choices:
"auto, x11, wayland, haiku, android, windows"

FWIW this is missing the rename of mesa-gl to match the mesa recipe. I've queued the missing piece for testing.

Cheers,

Richard

#2 lore raw
Quoted 1 line · Richard Purdie

FWIW this is missing the rename of mesa-gl to match the mesa recipe.

Oops!

Quoted 1 line

I've queued the missing piece for testing.

Thank you.