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

[Laurent Carlier]

    Date: Friday, October 25, 2019 @ 08:46:03
  Author: lcarlier
Revision: 365510

upgpkg: xorg-server 1.20.5-4

fix FS#62973

Added:
  xorg-server/trunk/0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch
Modified:
  xorg-server/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch |   53 ++++++++++
 PKGBUILD                                                        |    7 +
 2 files changed, 59 insertions(+), 1 deletion(-)

Added: 0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch
===================================================================
--- 0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch	                        (rev 0)
+++ 0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch	2019-10-25 08:46:03 UTC (rev 365510)
@@ -0,0 +1,53 @@
+From 2f0dd1816d556eef8c4b691330d39f13e1ed93f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer at amd.com>
+Date: Wed, 3 Jul 2019 11:53:56 +0200
+Subject: [PATCH] Revert "present/scmd: Check that the flip and screen pixmap
+ pitches match"
+
+This reverts commit ef91da2757050652c724f6e674e8b1acf5d0cb31.
+
+I thought this couldn't work under any circumstances, but I was wrong,
+and drivers are already checking for cases that really cannot work.
+
+Fixes issue #839.
+---
+ present/present_scmd.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/present/present_scmd.c b/present/present_scmd.c
+index 7c2f80997..8417d0925 100644
+--- a/present/present_scmd.c
++++ b/present/present_scmd.c
+@@ -78,7 +78,7 @@ present_check_flip(RRCrtcPtr            crtc,
+                    PresentFlipReason   *reason)
+ {
+     ScreenPtr                   screen = window->drawable.pScreen;
+-    PixmapPtr                   screen_pixmap, window_pixmap;
++    PixmapPtr                   window_pixmap;
+     WindowPtr                   root = screen->root;
+     present_screen_priv_ptr     screen_priv = present_screen_priv(screen);
+ 
+@@ -99,9 +99,8 @@ present_check_flip(RRCrtcPtr            crtc,
+         return FALSE;
+ 
+     /* Make sure the window hasn't been redirected with Composite */
+-    screen_pixmap = screen->GetScreenPixmap(screen);
+     window_pixmap = screen->GetWindowPixmap(window);
+-    if (window_pixmap != screen_pixmap &&
++    if (window_pixmap != screen->GetScreenPixmap(screen) &&
+         window_pixmap != screen_priv->flip_pixmap &&
+         window_pixmap != present_flip_pending_pixmap(screen))
+         return FALSE;
+@@ -127,8 +126,7 @@ present_check_flip(RRCrtcPtr            crtc,
+         window->drawable.x != pixmap->screen_x || window->drawable.y != pixmap->screen_y ||
+ #endif
+         window->drawable.width != pixmap->drawable.width ||
+-        window->drawable.height != pixmap->drawable.height ||
+-        pixmap->devKind != screen_pixmap->devKind) {
++        window->drawable.height != pixmap->drawable.height) {
+         return FALSE;
+     }
+ 
+-- 
+2.23.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-25 08:10:12 UTC (rev 365509)
+++ PKGBUILD	2019-10-25 08:46:03 UTC (rev 365510)
@@ -5,7 +5,7 @@
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest'
          'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.20.5
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -20,6 +20,7 @@
         xserver-autobind-hotplug.patch
         0001-v2-FS-58644.patch
         0002-fix-libshadow-2.patch
+	0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch
 	glvnd.patch
         xvfb-run # with updates from FC master
         xvfb-run.1)
@@ -32,6 +33,7 @@
             'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
             '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
             '0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271'
+            'd60662f4eefeb64a034563cbfc36167466e0f4b0357d996bdb3462de14b2936420414e3527defe72af781d9fe9757e7486a43f952d8b7740b08815bc5df7b28f'
             '0cdb9972af7fb215f0f2a7677cf05f0a35b7227a2953cb68a59d9947a02f6f1c128a080cf3e28d6c6295fc24d673cb258e29d6a976b8c924f73a797e5188452a'
             '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
             'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
@@ -50,6 +52,9 @@
   # https://bugs.freedesktop.org/show_bug.cgi?id=106656
   patch -Np1 -i ../0002-fix-libshadow-2.patch
 
+  # fix FS#62973 - merged upstream
+  patch -Np1 -i ../0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch
+
   # fix building with libglvnd - partially merged upstream - FS#64228
   patch -Np1 -i ../glvnd.patch
 }