[xsrc/trunk]: xsrc/external/mit/xorg-server/dist initial import of xorg-serve...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/914fe03b8b74
branches:  trunk
changeset: 10793:914fe03b8b74
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Aug 23 22:30:44 2021 +0000

description:
initial import of xorg-server-1.20.13

diffstat:

 external/mit/xorg-server/dist/ChangeLog         |  31 +++++++++++++++++++++++++
 external/mit/xorg-server/dist/m4/libtool.m4     |   2 +-
 external/mit/xorg-server/dist/meson.build       |   2 +-
 external/mit/xorg-server/dist/present/present.c |  10 +++++++-
 4 files changed, 42 insertions(+), 3 deletions(-)

diffs (86 lines):

diff -r 1aec800b9e61 -r 914fe03b8b74 external/mit/xorg-server/dist/ChangeLog
--- a/external/mit/xorg-server/dist/ChangeLog   Mon Aug 23 22:23:03 2021 +0000
+++ b/external/mit/xorg-server/dist/ChangeLog   Mon Aug 23 22:30:44 2021 +0000
@@ -1,3 +1,34 @@
+commit 86a72cb1927dd91132d231bb7920b651704601ef
+Author: Matt Turner <mattst88%gmail.com@localhost>
+Date:   Thu Jul 29 11:23:15 2021 -0700
+
+    xserver 1.20.13
+    
+    Signed-off-by: Matt Turner <mattst88%gmail.com@localhost>
+
+commit f85e4edba489316950fc3422f39e3c2ef8fb1ac5
+Author: Łukasz Spintzyk <lukasz.spintzyk%synaptics.com@localhost>
+Date:   Thu Jul 22 13:12:05 2021 +0200
+
+    modesetting: unflip not possible when glamor is not set
+    
+    This is fixing crashes of xfce when running under qemu
+    
+    (cherry picked from commit 8836b9d243444031b6396d39d345f2f83b5fa6a9)
+
+commit b03d7184b7906121a432b05473675937ab6c0f1e
+Author: Łukasz Spintzyk <lukasz.spintzyk%synaptics.com@localhost>
+Date:   Mon Jul 19 14:25:28 2021 +0200
+
+    present: fallback get_crtc to return crtc belonging to screen with present extension
+    
+    Since crtc can belong to secondary output that may not have present
+    extension enabled we should fallback to first enabled crtc or fake crtc.
+    
+    Fix for issue xorg/xserver#1195
+    
+    (cherry picked from commit d6c02ffd9c910637f6b3b7249507998e9e45f93c)
+
 commit b88ad0b342c954109bfd4b1d32c04ff55545cb0f
 Author: Matt Turner <mattst88%gmail.com@localhost>
 Date:   Thu Jul 8 12:15:21 2021 -0700
diff -r 1aec800b9e61 -r 914fe03b8b74 external/mit/xorg-server/dist/m4/libtool.m4
--- a/external/mit/xorg-server/dist/m4/libtool.m4       Mon Aug 23 22:23:03 2021 +0000
+++ b/external/mit/xorg-server/dist/m4/libtool.m4       Mon Aug 23 22:30:44 2021 +0000
@@ -1076,7 +1076,7 @@
          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
        10.[[012]][[,.]]*)
          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-       10.*)
+       10.*|11.*)
          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
diff -r 1aec800b9e61 -r 914fe03b8b74 external/mit/xorg-server/dist/meson.build
--- a/external/mit/xorg-server/dist/meson.build Mon Aug 23 22:23:03 2021 +0000
+++ b/external/mit/xorg-server/dist/meson.build Mon Aug 23 22:30:44 2021 +0000
@@ -3,7 +3,7 @@
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '1.20.12',
+        version: '1.20.13',
         meson_version: '>= 0.42.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')
diff -r 1aec800b9e61 -r 914fe03b8b74 external/mit/xorg-server/dist/present/present.c
--- a/external/mit/xorg-server/dist/present/present.c   Mon Aug 23 22:23:03 2021 +0000
+++ b/external/mit/xorg-server/dist/present/present.c   Mon Aug 23 22:30:44 2021 +0000
@@ -59,11 +59,19 @@
 {
     ScreenPtr                   screen = window->drawable.pScreen;
     present_screen_priv_ptr     screen_priv = present_screen_priv(screen);
+    RRCrtcPtr                   crtc = NULL;
 
     if (!screen_priv)
         return NULL;
 
-    return screen_priv->get_crtc(screen_priv, window);
+    crtc = screen_priv->get_crtc(screen_priv, window);
+    if (crtc && !present_screen_priv(crtc->pScreen)) {
+        crtc = RRFirstEnabledCrtc(screen);
+    }
+    if (crtc && !present_screen_priv(crtc->pScreen)) {
+        crtc = NULL;
+    }
+    return crtc;
 }
 
 /*