CVS commit: pkgsrc/x11/modular-xorg-server

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Nov  4 01:12:51 UTC 2016

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile distinfo
Added Files:
        pkgsrc/x11/modular-xorg-server/patches:
            patch-hw_xfree86_common_xf86pciBus.c

Log Message:
modular-xorg-server: try to autoload nouveau on netbsd too

bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86pciBus.c

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

Modified files:

Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.109 pkgsrc/x11/modular-xorg-server/Makefile:1.110
--- pkgsrc/x11/modular-xorg-server/Makefile:1.109       Sat Mar 12 08:50:50 2016
+++ pkgsrc/x11/modular-xorg-server/Makefile     Fri Nov  4 01:12:51 2016
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.109 2016/03/12 08:50:50 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2016/11/04 01:12:51 maya 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

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.76 pkgsrc/x11/modular-xorg-server/distinfo:1.77
--- pkgsrc/x11/modular-xorg-server/distinfo:1.76        Tue Jul 19 20:04:04 2016
+++ pkgsrc/x11/modular-xorg-server/distinfo     Fri Nov  4 01:12:51 2016
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.76 2016/07/19 20:04:04 wiz Exp $
+$NetBSD: distinfo,v 1.77 2016/11/04 01:12:51 maya Exp $
 
 SHA1 (xorg-server-1.18.4.tar.bz2) = ff088ee29dee46a2d68925c8df3f0515ef15ec52
 RMD160 (xorg-server-1.18.4.tar.bz2) = 6f58d84d3bbc59a773e6a2e1eafc208827a5923f
 SHA512 (xorg-server-1.18.4.tar.bz2) = 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 Size (xorg-server-1.18.4.tar.bz2) = 6009508 bytes
 SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2
+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

Added files:

Index: pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86pciBus.c
diff -u /dev/null pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86pciBus.c:1.1
--- /dev/null   Fri Nov  4 01:12:51 2016
+++ pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86pciBus.c Fri Nov  4 01:12:51 2016
@@ -0,0 +1,15 @@
+$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";