modular-xorg-server*: update to 1.20.6

1.20.6

A variety of bugfixes across the board, primarily in Xwayland and PRIME.
This release also includes GLX vendor selection support. Thanks to all
who contributed with testing and fixes!

Aaron Plattner (3):
     GLX: Set GlxServerExports::{major,minor}Version
     xfree86: Call ScreenInit for protocol screens before GPU screens
     os: Don't crash in AttendClient if the client is gone

Adam Jackson (7):
     xwayland: Expand the RANDR screen size limits
     miext/sync: Fix needless ABI change
     glx: Fix previous context validation in xorgGlxMakeCurrent
     meson: Fix another reference to "gl" 9.2.0
     meson: Apparently 1.2 is < 1.2.0
     mi: Add a default no-op miSourceValidate
     dix: Call SourceValidate before GetImage

Alex Goins (5):
     xsync: Add resource inside of SyncCreate, export SyncCreate
     randr: Fix RRCrtcDetachScanoutPixmap() segfault during server teardown
     modesetting: Fix ms_covering_crtc() segfault with non-modesetting slave primary
     modesetting: Fix ms_covering_crtc() segfault with non-xf86Crtc slave
     modesetting: Implement ms_covering_randr_crtc() for ms_present_get_crtc()

Alexander Tsoy (1):
     configure: Set libdrm flags correctly if only XORG is enabled

Alexander Volkov (1):
     shm: Use memfd_create when possible

Andres Rodriguez (1):
     xf86: Disable unused crtc functions when a lease is revoked

Carlos Garnacho (4):
     xwayland: Reset scheduled frames after hiding tablet cursor
     xwayland: Separate DamagePtr into separate window data
     xwayland: Refactor surface creation into a separate function
     xwayland: Handle the case of windows being realized before redirection

Eric Anholt (2):
     shm: reindent shm_tmpfile to follow our standards.
     shm: Pick the shm dir at run time, not build time.

Hans de Goede (1):
     glamor/xwayland: Define EGL_NO_X11

Kyle Brenneman (3):
     GLX: Add a per-client vendor mapping.
     GLX: Use the sending client for looking up XID's
     GLX: Add a function to change a clients vendor list.

Marco Trevisan (Treviño) (1):
     Xi: Use current device active grab to deliver touch events if any

Marvin Schmidt (1):
     build: glx: Lower gl version to work with libglvnd

Matt Roper (1):
     dri2: Sync i965_pci_ids.h from mesa

Matt Turner (3):
     dix: Assert noPanoramiXExtension is false in PanoramiX code
     xfree86: Test presence of isastream()
     xserver 1.20.6

Michel Dänzer (2):
     Revert "present/scmd: Check that the flip and screen pixmap pitches match"
     miext/sync: Make struct _SyncObject::initialized fully ABI compatible

Olivier Fourdan (7):
     xwayland: Avoid a crash on pointer enter with a grab
     xwayland: Check status in GBM pixmap creation
     glamor: Make pixmap exportable from `gbm_bo_from_pixmap()`
     xwayland: Update screen pixmap on output resize
     xwayland: Do not free a NULL GBM bo
     compiler.h: Do not include sys/io.h on ARM with glibc
     present/wnmd: Relax assertion on CRTC on abort_vblank()

Samuel Thibault (2):
     Fix crash on XkbSetMap
     Fix crash on XkbSetMap

Sven Joachim (1):
     modesetting: Fix broken manpage in autoconf build

1.20.5

Minor bugfix release to fix some input, Xwayland, glamor, and Present
issues. Thanks to all who contributed fixes and testing.

Adam Jackson (1):
      xserver 1.20.5

Michel Dänzer (3):
      Revert "gitlab-ci: Only run docker-image stage if relevant source files change"
      xwayland/present: Destroy sync_callback in xwl_present_cleanup
      present/scmd: Check that the flip and screen pixmap pitches match

Olivier Fourdan (2):
      xwayland: search for a render node to use
      glamor: pixmap FBO may not be allocated

Peter Hutterer (2):
      xwayland: fix a realloc OOM error case
      dix: leave last.valuators alone on slave switch

Ray Strode (1):
      dix: ensure work queues are cleared on reset

5 files changed, 10 insertions, 13 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 26241335683..2603a7d5840 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.122 2019/11/25 22:32:52 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2019/11/26 10:02:42 wiz Exp $
 
 DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Modular X11 server from modular X.org
diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common
index 6a539dcb1c7..c96460bc81d 100644
--- a/x11/modular-xorg-server/Makefile.common
+++ b/x11/modular-xorg-server/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.31 2019/11/26 09:13:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.32 2019/11/26 10:02:42 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.4
+XORG_VERSION=	1.20.6
 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 f66f6d9d874..467a7b81f19 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.96 2019/10/29 22:46:39 nia Exp $
+$NetBSD: distinfo,v 1.97 2019/11/26 10:02:42 wiz Exp $
 
-SHA1 (xorg-server-1.20.4.tar.bz2) = 1a79da92122124cb782a4eebfd83fd33d5c0d7d4
-RMD160 (xorg-server-1.20.4.tar.bz2) = cad624e1d1ada0b46a76a1e5de6b12446f7c6dda
-SHA512 (xorg-server-1.20.4.tar.bz2) = f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8
-Size (xorg-server-1.20.4.tar.bz2) = 6123780 bytes
+SHA1 (xorg-server-1.20.6.tar.bz2) = 59473e72136113f3a35b1ab5a5cfcbcad955b660
+RMD160 (xorg-server-1.20.6.tar.bz2) = bd0910e7ac3a346df13ef1957effea037c42d98f
+SHA512 (xorg-server-1.20.6.tar.bz2) = 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6
+Size (xorg-server-1.20.6.tar.bz2) = 6298697 bytes
 SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 0fa57d41ca2de306009f7f6256dfab34a11ea7a2
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
diff --git a/x11/modular-xorg-xephyr/Makefile b/x11/modular-xorg-xephyr/Makefile
index 41ad956456f..a3a83ddfebe 100644
--- a/x11/modular-xorg-xephyr/Makefile
+++ b/x11/modular-xorg-xephyr/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2019/11/25 22:32:52 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/26 10:02:42 wiz Exp $
 
 DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-xorg-xephyr-${XORG_VERSION}
-PKGREVISION=	3
 
 DISTINFO_FILE=		${.CURDIR}/../../x11/modular-xorg-server/distinfo
 PATCHDIR=		${.CURDIR}/../../x11/modular-xorg-server/patches
diff --git a/x11/modular-xorg-xwayland/Makefile b/x11/modular-xorg-xwayland/Makefile
index 9d6eacac589..ceea93d5091 100644
--- a/x11/modular-xorg-xwayland/Makefile
+++ b/x11/modular-xorg-xwayland/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2019/11/25 22:32:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/26 10:02:42 wiz Exp $
 
 DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-xorg-xwayland-${XORG_VERSION}
-PKGREVISION=	2
 
 DISTINFO_FILE=		${.CURDIR}/../../x11/modular-xorg-server/distinfo
 PATCHDIR=		${.CURDIR}/../../x11/modular-xorg-server/patches