Re: misc/50073: NetBSD current 7.99 modular Xorg no longer starts

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

The following reply was made to PR misc/50073; it has been noted by GNATS.

From: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: misc/50073: NetBSD current 7.99 modular Xorg no longer starts
Date: Wed, 22 Jul 2015 10:14:20 +1200

 On Tue, 21 Jul 2015 07:50:00 you wrote:
 > >Description:
 > A machine running pkgsrc X11_TYPE=modular with NetBSD 7.99.19 and then .20
 > fails to properly start Xorg after about July 7 whereas it was doing fine
 > before about July 1.  I am classifying this bug as misc and not pkg
 > because neither substituting and earlier kernel nor using an early pkg
 > corrects the problem.  I believe the problem to be some change in NetBSD
 > current world in that period.
 
 I think its a pkgsrc problem, mrg has already dealt with same issue in the 
 native Xorg.  Does updating your xproto to 7.0.28nb1 and then building 
 modular-xorg-server with the attached patches fix the problem?
 
 cheers
 mark
 
 Index: distinfo
 ===================================================================
 RCS file: /src/cvs/netbsd/pkgsrc/x11/modular-xorg-server/distinfo,v
 retrieving revision 1.61
 diff -u -r1.61 distinfo
 --- distinfo	30 Jun 2015 03:27:01 -0000	1.61
 +++ distinfo	21 Jul 2015 22:07:07 -0000
 @@ -12,3 +12,6 @@
  SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = 
 eddf15142e26f10f9028088f8e4e910bb6b5df59
  SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 
 499e536a1189b88bc17e3df44a9ae2397decdc8b
  SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 
 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
 +SHA1 (patch-os_WaitFor.c) = 6060455bd8d145116b4177c5b0f482cf39c741ea
 +SHA1 (patch-os_connection.c) = 19189656fbcabb0a48b68a7606660bda33e5d605
 +SHA1 (patch-os_io.c) = 42c41abee29d241e3d7e10d59764c573a2165d55
 --- /dev/null	2015-07-22 10:07:59.000000000 +1200
 +++ patches/patch-os_WaitFor.c	2015-07-22 10:06:06.000000000 +1200
 @@ -0,0 +1,24 @@
 +$NetBSD$
 +
 +move X11/Xpoll.h include earlier than sys/select.h to avoid missing
 +out on setting FD_SETSIZE early enough.
 +
 +--- os/WaitFor.c.orig	2015-07-21 21:58:16.000000000 +0000
 ++++ os/WaitFor.c
 +@@ -52,6 +52,8 @@ SOFTWARE.
 +  *
 +  *****************************************************************/
 + 
 ++#include <X11/Xpoll.h>
 ++
 + #ifdef HAVE_DIX_CONFIG_H
 + #include <dix-config.h>
 + #endif
 +@@ -66,7 +68,6 @@ SOFTWARE.
 + #include "misc.h"
 + 
 + #include "osdep.h"
 +-#include <X11/Xpoll.h>
 + #include "dixstruct.h"
 + #include "opaque.h"
 + #ifdef DPMSExtension
 --- /dev/null	2015-07-22 10:07:59.000000000 +1200
 +++ patches/patch-os_connection.c	2015-07-22 10:06:34.000000000 +1200
 @@ -0,0 +1,24 @@
 +$NetBSD$
 +
 +move X11/Xpoll.h include earlier than sys/select.h to avoid missing
 +out on setting FD_SETSIZE early enough.
 +
 +--- os/connection.c.orig	2015-07-21 21:58:52.000000000 +0000
 ++++ os/connection.c
 +@@ -60,6 +60,8 @@ SOFTWARE.
 +  *
 +  *****************************************************************/
 + 
 ++#include <X11/Xpoll.h>
 ++
 + #ifdef HAVE_DIX_CONFIG_H
 + #include <dix-config.h>
 + #endif
 +@@ -103,7 +105,6 @@ SOFTWARE.
 + #endif                          /* WIN32 */
 + #include "misc.h"               /* for typedef of pointer */
 + #include "osdep.h"
 +-#include <X11/Xpoll.h>
 + #include "opaque.h"
 + #include "dixstruct.h"
 + #include "xace.h"
 --- /dev/null	2015-07-22 10:07:59.000000000 +1200
 +++ patches/patch-os_io.c	2015-07-22 10:06:56.000000000 +1200
 @@ -0,0 +1,24 @@
 +$NetBSD$
 +
 +move X11/Xpoll.h include earlier than sys/select.h to avoid missing
 +out on setting FD_SETSIZE early enough.
 +
 +--- os/io.c.orig	2015-07-21 21:58:59.000000000 +0000
 ++++ os/io.c
 +@@ -51,6 +51,8 @@ SOFTWARE.
 +  *
 +  *****************************************************************/
 + 
 ++#include <X11/Xpoll.h>
 ++
 + #ifdef HAVE_DIX_CONFIG_H
 + #include <dix-config.h>
 + #endif
 +@@ -74,7 +76,6 @@ SOFTWARE.
 + #include <X11/Xproto.h>
 + #include "os.h"
 + #include "osdep.h"
 +-#include <X11/Xpoll.h>
 + #include "opaque.h"
 + #include "dixstruct.h"
 + #include "misc.h"