[arch-commits] Commit in mesa/trunk (3 files)
Laurent Carlier
lcarlier at archlinux.org
Thu May 6 11:30:03 UTC 2021
Date: Thursday, May 6, 2021 @ 11:30:03
Author: lcarlier
Revision: 414496
upgpkg: mesa 21.1.0-1: upstream update 21.1.0
Modified:
mesa/trunk/PKGBUILD
Deleted:
mesa/trunk/0001-amd-common-Add-missing-line-from-backport-for-cohere.patch
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 | 32 +-------
3 files changed, 6 insertions(+), 95 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 10:30:48 UTC (rev 414495)
+++ 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch 2021-05-06 11:30:03 UTC (rev 414496)
@@ -1,29 +0,0 @@
-From 93eb334093467272ad3028a62c515df3fb88bcb5 Mon Sep 17 00:00:00 2001
-From: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
-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 <lordheavym at gmail.com>
----
- 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 10:30:48 UTC (rev 414495)
+++ 0001-glx-Assign-unique-serial-number-to-GLXBadFBConfig-er.patch 2021-05-06 11:30:03 UTC (rev 414496)
@@ -1,40 +0,0 @@
-From 960c86d6787437b643825baa230bc0cd7f9f7540 Mon Sep 17 00:00:00 2001
-From: Bastian Beranek <bastian.beischer at rwth-aachen.de>
-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 <bastian.beischer at rwth-aachen.de>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10565>
-Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
----
- 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 10:30:48 UTC (rev 414495)
+++ PKGBUILD 2021-05-06 11:30:03 UTC (rev 414496)
@@ -6,8 +6,8 @@
pkgbase=mesa
pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=21.0.3
-pkgrel=3
+pkgver=21.1.0
+pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
@@ -16,13 +16,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 <emil.l.velikov at gmail.com>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
@@ -31,15 +27,6 @@
'71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dylan at pnwbakers.com>
'57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric at engestrom.ch>
-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() {
arch-meson mesa-$pkgver build \
-D b_lto=true \
@@ -48,8 +35,7 @@
-D dri-drivers=i915,i965,r100,r200,nouveau \
-D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr,iris,zink \
-D vulkan-drivers=amd,intel,swrast \
- -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 \
@@ -102,12 +88,10 @@
replaces=('vulkan-mesa-layer')
_install fakeinstall/usr/share/vulkan/explicit_layer.d
- _install fakeinstall/usr/lib/libVkLayer_MESA_overlay.so
+ _install fakeinstall/usr/share/vulkan/implicit_layer.d
+ _install fakeinstall/usr/lib/libVkLayer_*.so
_install fakeinstall/usr/bin/mesa-overlay-control.py
- _install fakeinstall/usr/share/vulkan/implicit_layer.d
- _install fakeinstall/usr/lib/libVkLayer_MESA_device_select.so
-
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
@@ -132,7 +116,6 @@
_install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
_install fakeinstall/usr/lib/libvulkan_intel.so
- _install fakeinstall/usr/include/vulkan/vulkan_intel.h
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
@@ -208,9 +191,6 @@
_install fakeinstall/usr/lib/libxatracker.so*
_install fakeinstall/usr/lib/libswrAVX*.so*
- # in vulkan-headers
- rm -rv fakeinstall/usr/include/vulkan
-
_install fakeinstall/usr/include
_install fakeinstall/usr/lib/pkgconfig
More information about the arch-commits
mailing list