[src/trunk]: src/external/mit/xorg/server/drivers enable igs driver on shark, ...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/af05b9f620d5
branches:  trunk
changeset: 347989:af05b9f620d5
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Sep 28 18:12:06 2016 +0000

description:
enable igs driver on shark, build pnozz and ag10e drivers only for old xorg
for now

diffstat:

 external/mit/xorg/server/drivers/Makefile |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r ce000f7a77fd -r af05b9f620d5 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Wed Sep 28 11:44:16 2016 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Wed Sep 28 18:12:06 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.88 2016/09/26 22:37:31 mrg Exp $
+#      $NetBSD: Makefile,v 1.89 2016/09/28 18:12:06 macallan Exp $
 
 .include <bsd.own.mk>
 
@@ -275,12 +275,8 @@
 .if ${MACHINE} == "shark"
 SUBDIR+= \
        xf86-video-chips \
+        xf86-video-igs \
         xf86-video-wsfb
-# needs porting for xorg-server 1.18
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
-        xf86-video-igs
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 .endif # ${MACHINE} == "shark"
 
 .if ${MACHINE} == "sparc" || \
@@ -294,15 +290,23 @@
        xf86-video-suncg6 \
        xf86-video-sunffb \
        xf86-video-wsfb
+#      xf86-video-ag10e \
+#      xf86-video-glint \
+
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 SUBDIR+= \
        xf86-video-ag10e \
        xf86-video-glint \
        xf86-video-sunleo
 .endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+
 .if ${MACHINE} == "sparc"
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 SUBDIR+= \
-       xf86-video-pnozz \
+       xf86-video-pnozz
+.endif  # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+
+SUBDIR+= \
        xf86-video-suncg14 \
        xf86-video-suntcx
 .endif # ${MACHINE} == "sparc"