[arch-commits] Commit in lib32-mesa/trunk (3 files)
Laurent Carlier
lcarlier at archlinux.org
Fri Sep 21 18:52:45 UTC 2018
Date: Friday, September 21, 2018 @ 18:52:44
Author: lcarlier
Revision: 383952
upgpkg: lib32-mesa 18.2.1-1
upstream update 18.2.1
Modified:
lib32-mesa/trunk/PKGBUILD
Deleted:
lib32-mesa/trunk/0001-glvnd-fix-gl.pc.patch
lib32-mesa/trunk/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch
-----------------------------------------------------------------+
0001-glvnd-fix-gl.pc.patch | 26 ---
0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch | 74 ----------
PKGBUILD | 6
3 files changed, 3 insertions(+), 103 deletions(-)
Deleted: 0001-glvnd-fix-gl.pc.patch
===================================================================
--- 0001-glvnd-fix-gl.pc.patch 2018-09-21 18:51:46 UTC (rev 383951)
+++ 0001-glvnd-fix-gl.pc.patch 2018-09-21 18:52:44 UTC (rev 383952)
@@ -1,26 +0,0 @@
-From a9554de2a6028540fa12a7ebdab4daf2b46010fa Mon Sep 17 00:00:00 2001
-Message-Id: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens at gmail.com>
-From: Unknown <>
-Date: Tue, 15 May 2018 20:10:53 +0200
-Subject: [PATCH 1/4] glvnd: fix gl.pc
-
----
- src/mesa/gl.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in
-index 181724b97b..8c7b7da8d7 100644
---- a/src/mesa/gl.pc.in
-+++ b/src/mesa/gl.pc.in
-@@ -7,7 +7,7 @@ Name: gl
- Description: Mesa OpenGL library
- Requires.private: @GL_PC_REQ_PRIV@
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -l at GL_LIB@
-+Libs: -L${libdir} -lGL
- Libs.private: @GL_PC_LIB_PRIV@
- Cflags: -I${includedir} @GL_PC_CFLAGS@
- glx_tls: @GLX_TLS@
---
-2.17.0
-
Deleted: 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch
===================================================================
--- 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch 2018-09-21 18:51:46 UTC (rev 383951)
+++ 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch 2018-09-21 18:52:44 UTC (rev 383952)
@@ -1,74 +0,0 @@
-From patchwork Tue May 8 09:42:05 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [Mesa-dev,
- 2/2] loader_dri3: Variant 2: Wait for pending swaps to complete
- before drawable_fini.
-From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel at daenzer.net>
-X-Patchwork-Id: 221466
-Message-Id: <ad7564c6-1e1b-8322-3e5c-d8045e181e10 at daenzer.net>
-To: Mario Kleiner <mario.kleiner.de at gmail.com>,
- Mike Lothian <mike at fireburn.co.uk>
-Cc: ML mesa-dev <mesa-dev at lists.freedesktop.org>,
- ML xorg-devel <xorg-devel at lists.x.org>
-Date: Tue, 8 May 2018 11:42:05 +0200
-
-On 2018-05-05 06:25 AM, Mario Kleiner wrote:
-> On Sat, May 5, 2018 at 4:08 AM, Mike Lothian <mike at fireburn.co.uk> wrote:
->> I definately saw the steam bug with patch 1 but not with plasmashell,
->> I started seeing it with patch 2 but it seemed to fix itself
->
-> I had two hangs of kwin_x11 within the last 6 hours when alt-tabbing
-> between windows, where it got stuck in the
-> loader_dri3_swapbuffer_barrier() from patch 1/2. Not sure how that is
-> possible, or if the stacktrace was misleading, because i had to VT
-> switch to a text console to attach the debugger and this might be just
-> a side effect of that. But if it is true, then patch 1/2 would not be
-> it. Also 1/2 has a potential performance impact, whereas 2/2 doesn't.
-> However 2/2 would also need more work, as i can think of more complex
-> scenarios where it would filter the wrong events, although not in the
-> case of plasmashell or steam. Probably we'd need to sacrifice a few
-> sbc bits in the Present events serial field to transport a unique tag
-> for each incarnation of the loader_dri3_drawable, like a mini-hash of
-> the draw->eid. Ugly ugly...
-
-How about the below?
-
-Idle notify events shouldn't need special treatment, since the pixmap
-XIDs of the buffers will be different between loader_dri3_drawable
-incarnations, aren't they?
-
-
-This still leaves the issue that the SBC moves backwards, which could
-theoretically result in hangs with apps using glXWaitForSbcOML. Fixing
-that would probably require changing the loader_dri3_drawable lifetime
-cycle, which would probably be very invasive, if feasible at all. Maybe
-we don't need to care about that for the time being, until there's a
-real world app running into it.
-
-diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
-index 6db8303d26d..f0ff2f07bde 100644
---- a/src/loader/loader_dri3_helper.c
-+++ b/src/loader/loader_dri3_helper.c
-@@ -370,9 +370,17 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw,
- * checking for wrap.
- */
- if (ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP) {
-- draw->recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial;
-- if (draw->recv_sbc > draw->send_sbc)
-- draw->recv_sbc -= 0x100000000;
-+ uint64_t recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial;
-+
-+ /* Only assume wraparound if that results in exactly the previous
-+ * SBC + 1, otherwise ignore received SBC > sent SBC (those are
-+ * probably from a previous loader_dri3_drawable instance) to avoid
-+ * calculating bogus target MSC values in loader_dri3_swap_buffers_msc
-+ */
-+ if (recv_sbc <= draw->send_sbc)
-+ draw->recv_sbc = recv_sbc;
-+ else if (recv_sbc == (draw->recv_sbc + 0x100000001ULL))
-+ draw->recv_sbc = recv_sbc - 0x100000000ULL;
-
- /* When moving from flip to copy, we assume that we can allocate in
- * a more optimal way if we don't need to cater for the display
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-09-21 18:51:46 UTC (rev 383951)
+++ PKGBUILD 2018-09-21 18:52:44 UTC (rev 383952)
@@ -4,8 +4,8 @@
pkgbase=lib32-mesa
pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
-pkgver=18.2.0
-pkgrel=2
+pkgver=18.2.1
+pkgrel=1
arch=('x86_64')
makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-libelf' 'lib32-llvm' 'lib32-libvdpau'
@@ -14,7 +14,7 @@
license=('custom')
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
LICENSE)
-sha512sums=('e6e997e166845009f6b97da204384758c797c870b56332652c0a2636734638f9180b7e4dbad144495645308ae4d77981a2493a22d57973723338b658e0655557'
+sha512sums=('d249bdf79aad36db9a8d291b3a1a100d283893ac741f58f85ae7e5c90ca25c37f80a5fa6fc57945ffeb0b67b788e7ea146543ec790b22f144578fc4c1525b84d'
'SKIP'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
More information about the arch-commits
mailing list