modular-xorg-server and friends: update to 1.20.10

Alex Goins (1):
      glamor: Update pixmap's devKind when making it exportable

Arthur Williams (1):
      include: Increase the number of max. input devices to 256.

Bernhard Übelacker (1):
      os: Fix instruction pointer written in xorg_backtrace

Greg V (1):
      xwayland: use drmGetNodeTypeFromFd for checking if a node is a render one

Kishore Kadiyala (1):
      modesetting: keep going if a modeset fails on EnterVT

Martin Peres (1):
      modesetting: check the kms state on EnterVT

Matt Turner (1):
      xserver 1.20.10

Matthieu Herrb (2):
      Fix XkbSetDeviceInfo() and SetDeviceIndicators() heap overflows
      Check SetMap request length carefully.

Michel Dänzer (10):
      glamor: Fix glamor_poly_fill_rect_gl xRectangle::width/height handling
      xfree86: Take second reference for SavedCursor in xf86CursorSetCursor
      present/wnmd: Can't use page flipping for windows clipped by children
      xwayland: Check window pixmap in xwl_present_check_flip2
      present/wnmd: Remove dead check from present_wnmd_check_flip
      present: Move flip target_msc adjustment out of present_vblank_create
      present: Add present_vblank::exec_msc field
      present/wnmd: Move up present_wnmd_queue_vblank
      present/wnmd: Execute copies at target_msc-1 already
      present/wnmd: Translate update region to screen space

Olivier Fourdan (8):
      Revert "linux: Fix platform device probe for DT-based PCI"
      Revert "linux: Fix platform device PCI detection for complex bus topologies"
      Revert "linux: Make platform device probe less fragile"
      xwayland: Do not discard frame callbacks on allow commits
      xwayland: Remove pending stream reference when freeing
      xwayland: non-rootless requires the wl_shell protocol
      xwayland: Create an xwl_window for toplevel only
      configure: Build hashtable for Xres and glvnd

3 files changed, 8 insertions, 9 deletions

diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common
index 0f51a4aeeb7..e22fe6d3d67 100644
--- a/x11/modular-xorg-server/Makefile.common
+++ b/x11/modular-xorg-server/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.37 2020/08/26 10:28:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.38 2020/12/01 21:03:16 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 # used by x11/modular-xorg-xwayland/Makefile
 
-XORG_VERSION=	1.20.9
+XORG_VERSION=	1.20.10
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index e3189fa83a8..5e6d98782fb 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.104 2020/09/28 01:08:15 khorben Exp $
+$NetBSD: distinfo,v 1.105 2020/12/01 21:03:16 wiz Exp $
 
-SHA1 (xorg-server-1.20.9.tar.bz2) = 4b70ac63fa864f0569712d634a61496d015c3b86
-RMD160 (xorg-server-1.20.9.tar.bz2) = 33a2370d1d9ce68774d0ac6fa803f2a4ce19b698
-SHA512 (xorg-server-1.20.9.tar.bz2) = d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6
-Size (xorg-server-1.20.9.tar.bz2) = 6302902 bytes
+SHA1 (xorg-server-1.20.10.tar.bz2) = e698b30adb781dfe0e7bee0aa489ea9df404a5db
+RMD160 (xorg-server-1.20.10.tar.bz2) = 1b10aaa1cf48e9d7377f091826d5b5f97bec7eca
+SHA512 (xorg-server-1.20.10.tar.bz2) = a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
+Size (xorg-server-1.20.10.tar.bz2) = 6307058 bytes
 SHA1 (patch-configure) = ce2c732c3d8493445744a927a25b9cd3b45880f8
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
diff --git a/x11/modular-xorg-xephyr/Makefile b/x11/modular-xorg-xephyr/Makefile
index a98157ab8c3..b1354abfeee 100644
--- a/x11/modular-xorg-xephyr/Makefile
+++ b/x11/modular-xorg-xephyr/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2020/09/28 01:08:15 khorben Exp $
+# $NetBSD: Makefile,v 1.23 2020/12/01 21:03:16 wiz Exp $
 
 DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-xorg-xephyr-${XORG_VERSION}
-PKGREVISION=	1
 
 DISTINFO_FILE=		${.CURDIR}/../../x11/modular-xorg-server/distinfo
 PATCHDIR=		${.CURDIR}/../../x11/modular-xorg-server/patches