modular-xorg-server-devel: update to latest rc

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon Apr 2 10:42:11 2018 +0200
Changeset:	e983384e34fdd2a6da5c687c9e61c8eb0a884e42

Modified Files:
	modular-xorg-server-devel/Makefile.common
	modular-xorg-server-devel/distinfo
Added Files:
	modular-xorg-server-devel/TODO
Removed Files:
	modular-xorg-server-devel/patches/patch-hw_xfree86_drivers_modesetting_driver.c

Log Message:
modular-xorg-server-devel: update to latest rc

Does not build on NetBSD.

gmake[4]: Entering directory '/scratch/wip/modular-xorg-server-devel/work/xorg-server-1.19.99.902/hw/xfree86'
  CC       sdksyms.o
sdksyms.c:1773:15: error: expected expression before ',' token
     (void *) &,                                                  /* ../../dri3/dri3.h:110 */
               ^
Makefile:821: recipe for target 'sdksyms.o' failed

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e983384e34fdd2a6da5c687c9e61c8eb0a884e42

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 modular-xorg-server-devel/Makefile.common          |  2 +-
 modular-xorg-server-devel/TODO                     |  6 ++
 modular-xorg-server-devel/distinfo                 |  9 ++-
 .../patch-hw_xfree86_drivers_modesetting_driver.c  | 71 ----------------------
 4 files changed, 11 insertions(+), 77 deletions(-)

diffs:
diff --git a/modular-xorg-server-devel/Makefile.common b/modular-xorg-server-devel/Makefile.common
index d9c2aa9495..01fee69d6d 100644
--- a/modular-xorg-server-devel/Makefile.common
+++ b/modular-xorg-server-devel/Makefile.common
@@ -2,7 +2,7 @@
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=	1.19.99.901
+XORG_VERSION=	1.19.99.902
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/modular-xorg-server-devel/TODO b/modular-xorg-server-devel/TODO
new file mode 100644
index 0000000000..63a5571f3e
--- /dev/null
+++ b/modular-xorg-server-devel/TODO
@@ -0,0 +1,6 @@
+gmake[4]: Entering directory '/scratch/wip/modular-xorg-server-devel/work/xorg-server-1.19.99.902/hw/xfree86'
+  CC       sdksyms.o
+sdksyms.c:1773:15: error: expected expression before ',' token
+     (void *) &,                                                  /* ../../dri3/dri3.h:110 */
+               ^
+Makefile:821: recipe for target 'sdksyms.o' failed
diff --git a/modular-xorg-server-devel/distinfo b/modular-xorg-server-devel/distinfo
index f9cdb9e36b..02e1b77a64 100644
--- a/modular-xorg-server-devel/distinfo
+++ b/modular-xorg-server-devel/distinfo
@@ -1,14 +1,13 @@
 $NetBSD: distinfo,v 1.87 2018/01/25 15:06:10 jperkin Exp $
 
-SHA1 (xorg-server-1.19.99.901.tar.bz2) = 3d366be05b15ef6dadd4c48fd78ed19b0b8a5de5
-RMD160 (xorg-server-1.19.99.901.tar.bz2) = b32ace81d250bfbbcd5583bbff245861f1627fbd
-SHA512 (xorg-server-1.19.99.901.tar.bz2) = c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5
-Size (xorg-server-1.19.99.901.tar.bz2) = 6131851 bytes
+SHA1 (xorg-server-1.19.99.902.tar.bz2) = b43da7f9be2e1eceddd7e22f909b6906b2e2a69f
+RMD160 (xorg-server-1.19.99.902.tar.bz2) = bb375fe2235d84842cb9e64e82364b413ee6af75
+SHA512 (xorg-server-1.19.99.902.tar.bz2) = 762198b48ec9f2c9b977aa90193fc30183a9cbb967338939d4b8f936430889ee1d7ab3d029cc12c5117adbf032b434777a63caa92f90ca4189587375ee7196de
+Size (xorg-server-1.19.99.902.tar.bz2) = 6077007 bytes
 SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
 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_drivers_modesetting_driver.c) = fbd861dd32c1b5a96b0e2318f17ad2c5009dc245
 SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
 SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
diff --git a/modular-xorg-server-devel/patches/patch-hw_xfree86_drivers_modesetting_driver.c b/modular-xorg-server-devel/patches/patch-hw_xfree86_drivers_modesetting_driver.c
deleted file mode 100644
index 7b8b9cc7a7..0000000000
--- a/modular-xorg-server-devel/patches/patch-hw_xfree86_drivers_modesetting_driver.c
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-Revert "modesetting: Remove #ifdefs XF86_PDEV_SERVER_FD"
-https://patchwork.freedesktop.org/patch/207937/
-
---- hw/xfree86/drivers/modesetting/driver.c.orig	2018-02-28 18:22:20.000000000 +0000
-+++ hw/xfree86/drivers/modesetting/driver.c
-@@ -244,12 +244,14 @@ probe_hw(const char *dev, struct xf86_pl
- {
-     int fd;
- 
-+#ifdef XF86_PDEV_SERVER_FD
-     if (platform_dev && (platform_dev->flags & XF86_PDEV_SERVER_FD)) {
-         fd = xf86_platform_device_odev_attributes(platform_dev)->fd;
-         if (fd == -1)
-             return FALSE;
-         return check_outputs(fd, NULL);
-     }
-+#endif
- 
-     fd = open_hw(dev);
-     if (fd != -1) {
-@@ -710,8 +712,10 @@ FreeRec(ScrnInfoPtr pScrn)
-             if (ms->pEnt->location.type == BUS_PCI)
-                 ret = drmClose(ms->fd);
-             else
-+#ifdef XF86_PDEV_SERVER_FD
-                 if (!(ms->pEnt->location.type == BUS_PLATFORM &&
-                       (ms->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD)))
-+#endif
-                     ret = close(ms->fd);
-             (void) ret;
-             ms_ent->fd = 0;
-@@ -824,11 +828,13 @@ ms_get_drm_master_fd(ScrnInfoPtr pScrn)
- 
- #ifdef XSERVER_PLATFORM_BUS
-     if (pEnt->location.type == BUS_PLATFORM) {
-+#ifdef XF86_PDEV_SERVER_FD
-         if (pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD)
-             ms->fd =
-                 xf86_platform_device_odev_attributes(pEnt->location.id.plat)->
-                 fd;
-         else
-+#endif
-         {
-             char *path =
-                 xf86_platform_device_odev_attributes(pEnt->location.id.plat)->
-@@ -1491,9 +1497,11 @@ SetMaster(ScrnInfoPtr pScrn)
-     modesettingPtr ms = modesettingPTR(pScrn);
-     int ret;
- 
-+#ifdef XF86_PDEV_SERVER_FD
-     if (ms->pEnt->location.type == BUS_PLATFORM &&
-         (ms->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD))
-         return TRUE;
-+#endif
- 
-     ret = drmSetMaster(ms->fd);
-     if (ret)
-@@ -1742,9 +1750,11 @@ LeaveVT(ScrnInfoPtr pScrn)
- 
-     pScrn->vtSema = FALSE;
- 
-+#ifdef XF86_PDEV_SERVER_FD
-     if (ms->pEnt->location.type == BUS_PLATFORM &&
-         (ms->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD))
-         return;
-+#endif
- 
-     drmDropMaster(ms->fd);
- }