Tue Nov 26 10:02:42 2019 UTC ()
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


(wiz)
diff -r1.122 -r1.123 pkgsrc/x11/modular-xorg-server/Makefile
diff -r1.31 -r1.32 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.96 -r1.97 pkgsrc/x11/modular-xorg-server/distinfo
diff -r1.17 -r1.18 pkgsrc/x11/modular-xorg-xephyr/Makefile
diff -r1.3 -r1.4 pkgsrc/x11/modular-xorg-xwayland/Makefile

cvs diff -r1.122 -r1.123 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2019/11/25 22:32:52 1.122
+++ pkgsrc/x11/modular-xorg-server/Makefile 2019/11/26 10:02:42 1.123
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.122 2019/11/25 22:32:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.123 2019/11/26 10:02:42 wiz Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-${DISTNAME} 4PKGNAME= modular-${DISTNAME}
5PKGREVISION= 3 
6 5
7MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Modular X11 server from modular X.org 7COMMENT= Modular X11 server from modular X.org
9 8
10SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 9SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
11 10
12NOT_FOR_PLATFORM= Darwin-*-* 11NOT_FOR_PLATFORM= Darwin-*-*
13 12
14.include "Makefile.common" 13.include "Makefile.common"
15 14
16CONFIGURE_ARGS+= --enable-xorg 15CONFIGURE_ARGS+= --enable-xorg
17CONFIGURE_ARGS+= --disable-xephyr 16CONFIGURE_ARGS+= --disable-xephyr
18CONFIGURE_ARGS+= --disable-xwayland 17CONFIGURE_ARGS+= --disable-xwayland

cvs diff -r1.31 -r1.32 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile.common 2019/11/26 09:13:11 1.31
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2019/11/26 10:02:42 1.32
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.31 2019/11/26 09:13:11 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.32 2019/11/26 10:02:42 wiz Exp $
2# used by x11/modular-xorg-server/Makefile 2# used by x11/modular-xorg-server/Makefile
3# used by x11/modular-xorg-xephyr/Makefile 3# used by x11/modular-xorg-xephyr/Makefile
4# used by x11/modular-xorg-xwayland/Makefile 4# used by x11/modular-xorg-xwayland/Makefile
5 5
6XORG_VERSION= 1.20.4 6XORG_VERSION= 1.20.6
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause 12LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17USE_LANGUAGES+= c99 17USE_LANGUAGES+= c99
18 18
19PKGCONFIG_OVERRIDE+= xorg-server.pc.in 19PKGCONFIG_OVERRIDE+= xorg-server.pc.in

cvs diff -r1.96 -r1.97 pkgsrc/x11/modular-xorg-server/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2019/10/29 22:46:39 1.96
+++ pkgsrc/x11/modular-xorg-server/distinfo 2019/11/26 10:02:42 1.97
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.96 2019/10/29 22:46:39 nia Exp $ 1$NetBSD: distinfo,v 1.97 2019/11/26 10:02:42 wiz Exp $
2 2
3SHA1 (xorg-server-1.20.4.tar.bz2) = 1a79da92122124cb782a4eebfd83fd33d5c0d7d4 3SHA1 (xorg-server-1.20.6.tar.bz2) = 59473e72136113f3a35b1ab5a5cfcbcad955b660
4RMD160 (xorg-server-1.20.4.tar.bz2) = cad624e1d1ada0b46a76a1e5de6b12446f7c6dda 4RMD160 (xorg-server-1.20.6.tar.bz2) = bd0910e7ac3a346df13ef1957effea037c42d98f
5SHA512 (xorg-server-1.20.4.tar.bz2) = f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8 5SHA512 (xorg-server-1.20.6.tar.bz2) = 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6
6Size (xorg-server-1.20.4.tar.bz2) = 6123780 bytes 6Size (xorg-server-1.20.6.tar.bz2) = 6298697 bytes
7SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f 7SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
8SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 0fa57d41ca2de306009f7f6256dfab34a11ea7a2 8SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 0fa57d41ca2de306009f7f6256dfab34a11ea7a2
9SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 9SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
10SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a 10SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
11SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3 11SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
12SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99 12SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230 13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
14SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b 14SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
15SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60 15SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
16SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400 16SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
17SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e 17SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
18SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544 18SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
19SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0 19SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0

cvs diff -r1.17 -r1.18 pkgsrc/x11/modular-xorg-xephyr/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-xephyr/Makefile 2019/11/25 22:32:52 1.17
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile 2019/11/26 10:02:42 1.18
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.17 2019/11/25 22:32:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.18 2019/11/26 10:02:42 wiz Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-xorg-xephyr-${XORG_VERSION} 4PKGNAME= modular-xorg-xephyr-${XORG_VERSION}
5PKGREVISION= 3 
6 5
7DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo 6DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo
8PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches 7PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches
9 8
10MAINTAINER= khorben@defora.org 9MAINTAINER= khorben@defora.org
11COMMENT= Xephyr server based on kdrive from modular X.org 10COMMENT= Xephyr server based on kdrive from modular X.org
12 11
13BROKEN_ON_PLATFORM+= Darwin-*-* 12BROKEN_ON_PLATFORM+= Darwin-*-*
14 13
15.include "../../x11/modular-xorg-server/Makefile.common" 14.include "../../x11/modular-xorg-server/Makefile.common"
16 15
17CONFIGURE_ARGS+= --disable-xorg 16CONFIGURE_ARGS+= --disable-xorg
18CONFIGURE_ARGS+= --disable-xnest 17CONFIGURE_ARGS+= --disable-xnest

cvs diff -r1.3 -r1.4 pkgsrc/x11/modular-xorg-xwayland/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-xwayland/Makefile 2019/11/25 22:32:52 1.3
+++ pkgsrc/x11/modular-xorg-xwayland/Makefile 2019/11/26 10:02:42 1.4
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2019/11/25 22:32:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2019/11/26 10:02:42 wiz Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-xorg-xwayland-${XORG_VERSION} 4PKGNAME= modular-xorg-xwayland-${XORG_VERSION}
5PKGREVISION= 2 
6 5
7DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo 6DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo
8PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches 7PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches
9 8
10MAINTAINER= nia@NetBSD.org 9MAINTAINER= nia@NetBSD.org
11COMMENT= Server for running X clients under Wayland from modular X.org 10COMMENT= Server for running X clients under Wayland from modular X.org
12 11
13.include "../../x11/modular-xorg-server/Makefile.common" 12.include "../../x11/modular-xorg-server/Makefile.common"
14 13
15CONFIGURE_ARGS+= --disable-xorg 14CONFIGURE_ARGS+= --disable-xorg
16CONFIGURE_ARGS+= --disable-xephyr 15CONFIGURE_ARGS+= --disable-xephyr
17CONFIGURE_ARGS+= --disable-xnest 16CONFIGURE_ARGS+= --disable-xnest
18CONFIGURE_ARGS+= --disable-xvfb 17CONFIGURE_ARGS+= --disable-xvfb