Date: Thursday, May 6, 2021 @ 12:05:17 Author: lcarlier Revision: 928445
upgpkg: lib32-mesa 21.1.0-1: upstream update 21.1.0 Modified: lib32-mesa/trunk/PKGBUILD Deleted: lib32-mesa/trunk/0001-amd-common-Add-missing-line-from-backport-for-cohere.patch lib32-mesa/trunk/0001-glx-Assign-unique-serial-number-to-GLXBadFBConfig-er.patch -----------------------------------------------------------------+ 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch | 29 ------- 0001-glx-Assign-unique-serial-number-to-GLXBadFBConfig-er.patch | 40 ---------- PKGBUILD | 31 +------ 3 files changed, 6 insertions(+), 94 deletions(-) Deleted: 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch =================================================================== --- 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch 2021-05-06 11:38:39 UTC (rev 928444) +++ 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch 2021-05-06 12:05:17 UTC (rev 928445) @@ -1,29 +0,0 @@ -From 93eb334093467272ad3028a62c515df3fb88bcb5 Mon Sep 17 00:00:00 2001 -From: Bas Nieuwenhuizen <[email protected]> -Date: Sat, 24 Apr 2021 16:23:43 +0200 -Subject: [PATCH] amd/common: Add missing line from backport for coherency. - -The line initializing the variable was missed. - -Fixes: ccc4abdbf4b ("ac/gpu_info: fix more non-coherent RB and GL2 combinations") -Signed-off-by: Laurent Carlier <[email protected]> ---- - src/amd/common/ac_gpu_info.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c -index 47e6b8c332f..44728827197 100644 ---- a/src/amd/common/ac_gpu_info.c -+++ b/src/amd/common/ac_gpu_info.c -@@ -710,6 +710,8 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, - info->num_tcc_blocks = info->max_tcc_blocks; - } - -+ info->tcc_rb_non_coherent = !util_is_power_of_two_or_zero(info->num_tcc_blocks); -+ - info->mc_arb_ramcfg = amdinfo->mc_arb_ramcfg; - info->gb_addr_config = amdinfo->gb_addr_cfg; - if (info->chip_class >= GFX9) { --- -2.31.1 - Deleted: 0001-glx-Assign-unique-serial-number-to-GLXBadFBConfig-er.patch =================================================================== --- 0001-glx-Assign-unique-serial-number-to-GLXBadFBConfig-er.patch 2021-05-06 11:38:39 UTC (rev 928444) +++ 0001-glx-Assign-unique-serial-number-to-GLXBadFBConfig-er.patch 2021-05-06 12:05:17 UTC (rev 928445) @@ -1,40 +0,0 @@ -From 960c86d6787437b643825baa230bc0cd7f9f7540 Mon Sep 17 00:00:00 2001 -From: Bastian Beranek <[email protected]> -Date: Sat, 1 May 2021 09:52:01 +0200 -Subject: [PATCH] glx: Assign unique serial number to GLXBadFBConfig error - -Since commit f39fd3dce72 a new GLX error is issued in case context creation -fails. This broke wine on certain hardware: While wine installs an error handler -to ignore this kind of error, it does not function because it expects the -dpy->request serial number of the error to be incremented since the installation -of the handler. - -Workaround this by artificially increasing the request number. This also -guarantees a unique serial number for the error. - -Fixes: f39fd3dce72eaef59ab39a23b75030ef9efc2a40 -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3969 -Signed-off-by: Bastian Beranek <[email protected]> -Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10565> -Signed-off-by: Laurent Carlier <[email protected]> ---- - src/glx/create_context.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/glx/create_context.c b/src/glx/create_context.c -index e3a513f58f6..7e1cec98c64 100644 ---- a/src/glx/create_context.c -+++ b/src/glx/create_context.c -@@ -146,6 +146,9 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config, - * somehow on the client side. clean up the server resource and panic. - */ - xcb_glx_destroy_context(c, xid); -+ /* increment dpy->request in order to give a unique serial number to the -+ * error */ -+ XNoOp(dpy); - __glXSendError(dpy, GLXBadFBConfig, xid, 0, False); - } else { - gc->xid = xid; --- -2.31.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-06 11:38:39 UTC (rev 928444) +++ PKGBUILD 2021-05-06 12:05:17 UTC (rev 928445) @@ -6,8 +6,8 @@ pkgbase=lib32-mesa pkgname=('lib32-vulkan-mesa-layers' 'lib32-opencl-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa') pkgdesc="An open-source implementation of the OpenGL specification (32-bit)" -pkgver=21.0.3 -pkgrel=3 +pkgver=21.1.0 +pkgrel=1 arch=('x86_64') makedepends=('python-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'xorgproto' 'lib32-libdrm' 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libvdpau' @@ -17,13 +17,9 @@ url="https://www.mesa3d.org/"; license=('custom') source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} - 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch - 0001-glx-Assign-unique-serial-number-to-GLXBadFBConfig-er.patch LICENSE) -sha512sums=('4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f' +sha512sums=('9d7617a6d5dd8ec1d93fdda8fe8b2f745695c02bc381d685f1257f7e7f08d5c06f3c57ae71c5f2dfaabb1742b8a88f47294a369bd3ac553f29835f24ce5dd350' 'SKIP' - 'f47c227dc888f2030491eaad42d42150539f2c9fc3bbc76d0fd46dc2d85482f520d929b01314cabb963dd36cc3729967f40c7bbfde28fc655024ef52d9fc71b7' - '7922e1c444e49f40c36d748f0fc0f76eba11d2d93d9c2f1c1dc4acbc5fe2ebf7c8f954a35265aef6dde3477cc6b5a49502786e1b6f01aa8027f7df215cde816c' 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <[email protected]> '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <[email protected]> @@ -32,15 +28,6 @@ '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <[email protected]> '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <[email protected]> -prepare() { - cd mesa-$pkgver - - # fix FS#70554 - https://gitlab.freedesktop.org/mesa/mesa/-/issues/4691 - patch -Np1 -i ../0001-amd-common-Add-missing-line-from-backport-for-cohere.patch - # fix FS#70015 - patch -Np1 -i ../0001-glx-Assign-unique-serial-number-to-GLXBadFBConfig-er.patch -} - build() { export CC="gcc -m32" export CXX="g++ -m32" @@ -61,8 +48,7 @@ -D dri-drivers=i915,i965,r100,r200,nouveau \ -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,zink \ -D vulkan-drivers=amd,intel \ - -D vulkan-overlay-layer=true \ - -D vulkan-device-select-layer=true \ + -D vulkan-layers=device-select,intel-nullhw,overlay \ -D swr-arches=avx,avx2 \ -D dri3=enabled \ -D egl=enabled \ @@ -115,11 +101,10 @@ replaces=('lib32-vulkan-mesa-layer') rm -rv fakeinstall/usr/share/vulkan/explicit_layer.d - _install fakeinstall/usr/lib32/libVkLayer_MESA_overlay.so + rm -rv fakeinstall/usr/share/vulkan/implicit_layer.d rm -rv fakeinstall/usr/bin/mesa-overlay-control.py - rm -rv fakeinstall/usr/share/vulkan/implicit_layer.d - _install fakeinstall/usr/lib32/libVkLayer_MESA_device_select.so + _install fakeinstall/usr/lib32/libVkLayer_*.so install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE } @@ -145,7 +130,6 @@ _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json _install fakeinstall/usr/lib32/libvulkan_intel.so - rm -rv fakeinstall/usr/include/vulkan/vulkan_intel.h install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE } @@ -208,9 +192,6 @@ _install fakeinstall/usr/lib32/libxatracker.so* #_install fakeinstall/usr/lib32/libswrAVX*.so* - # in vulkan-headers - rm -rv fakeinstall/usr/include/vulkan - rm -rv fakeinstall/usr/include _install fakeinstall/usr/lib32/pkgconfig
