From 216d1e8f91dacf40eeaf8f4e7db729ec37bfcd6f Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Wed, 24 Jan 2024 09:37:15 +0000 Subject: [PATCH] mesa: disable resource_create_front for vtest --- ...able-resource_create_front-for-vtest.patch | 19 +++++++++++++++++++ packages/mesa/build.sh | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 packages/mesa/0011-disable-resource_create_front-for-vtest.patch diff --git a/packages/mesa/0011-disable-resource_create_front-for-vtest.patch b/packages/mesa/0011-disable-resource_create_front-for-vtest.patch new file mode 100644 index 0000000000..d4fa2d7b87 --- /dev/null +++ b/packages/mesa/0011-disable-resource_create_front-for-vtest.patch @@ -0,0 +1,19 @@ +This reverts https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11714, +which implements resource_create_front for vtest. + +It breaks `glxinfo` with `virglrenderer-android`. + +--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c ++++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c +@@ -304,7 +304,11 @@ + } + + res->res_handle = handle; ++#ifndef __TERMUX__ + if (map_front_private && res->ptr && res->dt) { ++#else ++ if (map_front_private && res->ptr && res->dt && getenv("TERMUX_ENABLE_GLXCOPYSUBBUFFERMESA_FOR_VTEST")) { ++#endif + void *dt_map = vtws->sws->displaytarget_map(vtws->sws, res->dt, PIPE_MAP_READ_WRITE); + uint32_t shm_stride = util_format_get_stride(res->format, res->width); + util_copy_rect(res->ptr, res->format, shm_stride, 0, 0, diff --git a/packages/mesa/build.sh b/packages/mesa/build.sh index b536ecc561..04ad3b7c81 100644 --- a/packages/mesa/build.sh +++ b/packages/mesa/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="docs/license.rst" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="23.3.3" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=518307c0057fa3cee8b58df78be431d4df5aafa7edc60d09278b2d7a0a80f3b4 TERMUX_PKG_AUTO_UPDATE=true