[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server modular-xorg-server: update to...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4777288fe06e
branches:  trunk
changeset: 330313:4777288fe06e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Feb 27 16:32:58 2019 +0000

description:
modular-xorg-server: update to 1.20.4.

A variety of bugfixes across the board, but primarily in Xwayland.
Thanks to all who contributed with testing and fixes!

A. Wilcox (1):
      DRI2: Add another Coffeelake PCI ID

Adam Jackson (6):
      automake: Distribute meson's configure header templates
      dri3: Fix XACE access mode for open and get_supported_modifiers
      mi: When {en,dis}abling extensions, match names case-insensitively
      vnd: Fix a silly memory leak
      gitlab: Skip the docker-in-docker step
      xserver 1.20.4

Alan Coopersmith (3):
      Update README for gitlab migration
      Update configure.ac bug URL for gitlab migration
      os: Report errors opening authorization file (#469)

Ilia Mirkin (1):
      modesetting: fix conn_id termination and potential overrun by 1 byte

Lionel Landwerlin (1):
      present: fix compile warning with debug traces

Lyude Paul (1):
      modesetting: Actually disable CRTCs in legacy mode

Maya Rashish (2):
      Fix typo in error message
      xfree86: Try nouveau on NetBSD as well.

Michel Daenzer (2):
      travis: Use a single meson invocation
      Make artifacts of piglit results if job fails

Michel D?nzer (22):
      xwayland: Plug leaks in xwl_present_sync_callback
      xwayland: Use xwl_present_reset_timer in xwl_present_timer_callback
      xwayland: Rename xwl_present_events_notify to xwl_present_msc_bump
      xwayland: Complete "synchronous" Present flips from xwl_present_msc_bump
      xwayland: Replace xwl_window::present_window with ::present_flipped
      xwayland: Add xwl_present_unrealize_window
      xwayland: Don't need xwl_window anymore in xwl_present_queue_vblank
      xwayland: Don't take buffer release queue into account for frame timer
      glamor: Check that storage format is compatible with RENDER format
      xfree86/modes: Don't clobber gamma LUT of compatibility output's CRTC
      Drop Travis Linux build in favour of GitLab CI
      gitlab-ci: Docker image can be generated as part of pipeline
      test: Use .../piglit instead of .../piglit-*.py
      gitlab-ci: Set LC_ALL=C.UTF-8
      gitlab-ci: Only run docker-image stage if relevant source files change
      gitlab-ci: Don't rely on $CI_PROJECT_NAME
      gitlab-ci: Add ccache to docker image, and leave in autotools
      gitlab-ci: Use ccache
      gitlab-ci: Add autotools build & test job
      present/wnmd: Allow flipping if the window pixmap matches the toplevel's
      glx,xquartz: Fix make distcheck
      gitlab-ci: Run make distcheck in autotools build & test job

Olivier Fourdan (3):
      present/wnmd: Fix use after free on CRTC removal
      xwayland: do not crash if `gbm_bo_create()` fails
      xwayland: handle case without any crtc

Peter Harris (1):
      os: Fix GetTimeInMicros resolution

Peter Hutterer (2):
      test: fix failing tests
      Xi: lock the input thread for any pointer barrier list manipulation

diffstat:

 x11/modular-xorg-server/Makefile                                     |   3 +-
 x11/modular-xorg-server/Makefile.common                              |   4 +-
 x11/modular-xorg-server/distinfo                                     |  11 +++----
 x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86pciBus.c |  15 ----------
 4 files changed, 8 insertions(+), 25 deletions(-)

diffs (67 lines):

diff -r 3a1ce81716fe -r 4777288fe06e x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile  Wed Feb 27 15:44:53 2019 +0000
+++ b/x11/modular-xorg-server/Makefile  Wed Feb 27 16:32:58 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.117 2018/10/26 10:20:12 maya Exp $
+# $NetBSD: Makefile,v 1.118 2019/02/27 16:32:58 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
-PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Modular X11 server from modular X.org
diff -r 3a1ce81716fe -r 4777288fe06e x11/modular-xorg-server/Makefile.common
--- a/x11/modular-xorg-server/Makefile.common   Wed Feb 27 15:44:53 2019 +0000
+++ b/x11/modular-xorg-server/Makefile.common   Wed Feb 27 16:32:58 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.26 2018/10/25 22:40:57 maya Exp $
+# $NetBSD: Makefile.common,v 1.27 2019/02/27 16:32:58 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=  1.20.3
+XORG_VERSION=  1.20.4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 3a1ce81716fe -r 4777288fe06e x11/modular-xorg-server/distinfo
--- a/x11/modular-xorg-server/distinfo  Wed Feb 27 15:44:53 2019 +0000
+++ b/x11/modular-xorg-server/distinfo  Wed Feb 27 16:32:58 2019 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.92 2018/10/26 10:20:12 maya Exp $
+$NetBSD: distinfo,v 1.93 2019/02/27 16:32:58 wiz Exp $
 
-SHA1 (xorg-server-1.20.3.tar.bz2) = a522cd543606b4d0509d821b8061904951171c50
-RMD160 (xorg-server-1.20.3.tar.bz2) = a57a7e3d0d2e3c84f4743de6890c7d26b502e7a1
-SHA512 (xorg-server-1.20.3.tar.bz2) = ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba
-Size (xorg-server-1.20.3.tar.bz2) = 6205000 bytes
+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 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 0fa57d41ca2de306009f7f6256dfab34a11ea7a2
-SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 896825ba12646431cba603938d118acbdde305dd
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
 SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
diff -r 3a1ce81716fe -r 4777288fe06e x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86pciBus.c
--- a/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86pciBus.c      Wed Feb 27 15:44:53 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-hw_xfree86_common_xf86pciBus.c,v 1.1 2016/11/04 01:12:51 maya Exp $
-
-NetBSD also has nouveau, try to autoload it
-
---- hw/xfree86/common/xf86pciBus.c.orig        2016-07-15 16:18:11.000000000 +0000
-+++ hw/xfree86/common/xf86pciBus.c
-@@ -1189,7 +1189,7 @@ xf86VideoPtrToDriverList(struct pci_devi
-     {
-         int idx = 0;
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
-         driverList[idx++] = "nouveau";
- #endif
-         driverList[idx++] = "nv";