[arch-commits] Commit in mesa/trunk (2 files)

[Laurent Carlier]

    Date: Sunday, May 13, 2018 @ 15:39:59
  Author: lcarlier
Revision: 324160

upgpkg: mesa 18.0.3-2

fix FS#58549

Added:
  mesa/trunk/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
Modified:
  mesa/trunk/PKGBUILD

--------------------------------------------------------------------------------+
 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch |   14 ++++++++++
 PKGBUILD                                                                       |    9 +++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

Added: 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
===================================================================
--- 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch	                        (rev 0)
+++ 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch	2018-05-13 15:39:59 UTC (rev 324160)
@@ -0,0 +1,14 @@
+diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
+index 6bb11c4..7bd79af 100644
+--- a/src/loader/loader_dri3_helper.c
++++ b/src/loader/loader_dri3_helper.c
+@@ -234,6 +234,9 @@ loader_dri3_drawable_fini(struct loader_dri3_drawable *draw)
+ {
+    int i;
+ 
++   if (draw->special_event)
++      loader_dri3_swapbuffer_barrier(draw);
++
+    draw->ext->core->destroyDrawable(draw->dri_drawable);
+ 
+    for (i = 0; i < ARRAY_SIZE(draw->buffers); i++) {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-13 15:37:31 UTC (rev 324159)
+++ PKGBUILD	2018-05-13 15:39:59 UTC (rev 324160)
@@ -6,7 +6,7 @@
 pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
 pkgver=18.0.3
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
@@ -17,6 +17,7 @@
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE
         0001-glvnd-fix-gl-dot-pc.patch
+        0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
         0004-meson-Add-library-versions-to-swr-drivers.patch
         0005-meson-Version-libMesaOpenCL-like-autotools-does.patch)
 sha512sums=('decd050bab049d17bcde3f832d4da0ffdb80f147c99377a162739bbe72fd6fd32b51e56e6fc66895b8c30fc19a1815bae164b21aa557816c3998ad18c1ffca2d'
@@ -23,6 +24,7 @@
             'SKIP'
             'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
             '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
+            '19b980db37675732d28978318074ca172ef862de7fdcae2c82ef16dc411c709c8598b044a828e7e260d86d23f644485abcc6a0aaf5e04b9c05dce22d0c7e3716'
             '0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff'
             'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
@@ -36,6 +38,11 @@
   # non-upstreamed ones
   patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch
 
+  # experimental patch, should fix FS#58549
+  # see https://bugs.freedesktop.org/show_bug.cgi?id=106351
+  # and https://patchwork.freedesktop.org/series/42687/
+  patch -Np1 -i ../0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
+
   # Upstreamed meson fixes
   patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch
   patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch