[src/trunk]: src/external/mit/xorg/server update build for sparc64 xorg-serve...

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

details:   https://anonhg.NetBSD.org/src/rev/07a789cdbbc6
branches:  trunk
changeset: 347266:07a789cdbbc6
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Aug 19 19:10:54 2016 +0000

description:
update build for sparc64 xorg-server 1.18.
clean up the xfree86/common makefile for obsolete warnings. (XXX: there are
a lot of old disabled warnings we can obsolete in the xsrc tree.)

diffstat:

 external/mit/xorg/server/drivers/Makefile                       |  15 ++++++----
 external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile     |   5 ++-
 external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile     |   5 ++-
 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile |  12 +------
 4 files changed, 19 insertions(+), 18 deletions(-)

diffs (95 lines):

diff -r c9509d84aed6 -r 07a789cdbbc6 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Fri Aug 19 19:09:50 2016 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Fri Aug 19 19:10:54 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.78 2016/08/19 03:59:30 mrg Exp $
+#      $NetBSD: Makefile,v 1.79 2016/08/19 19:10:54 mrg Exp $
 
 # xf86-input drivers
 
@@ -278,17 +278,20 @@
 .if ${MACHINE} == "sparc" || \
     ${MACHINE} == "sparc64"
 SUBDIR+= \
-       xf86-video-ag10e \
        xf86-video-ati \
-       xf86-video-glint \
        xf86-video-mach64 \
-       xf86-video-mga \
        xf86-video-r128 \
        xf86-video-radeon \
        xf86-video-suncg6 \
+       xf86-video-wsfb
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
+       xf86-video-ag10e \
+       xf86-video-glint \
+       xf86-video-mga \
        xf86-video-sunffb \
-       xf86-video-sunleo \
-       xf86-video-wsfb
+       xf86-video-sunleo
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 .if ${MACHINE} == "sparc"
 SUBDIR+= \
        xf86-video-pnozz \
diff -r c9509d84aed6 -r 07a789cdbbc6 external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile       Fri Aug 19 19:09:50 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile       Fri Aug 19 19:10:54 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2016/08/16 06:24:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2016/08/19 19:10:54 mrg Exp $
 
 DRIVER=                xf86-video-suncg6
 DRIVER_NAME=   suncg6_drv
@@ -9,4 +9,7 @@
 
 MAN=           suncg6.4
 
+# XXX
+COPTS.cg6_accel.c+=    -Wno-error=discarded-qualifiers
+
 .include "../Makefile.xf86-driver"
diff -r c9509d84aed6 -r 07a789cdbbc6 external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile       Fri Aug 19 19:09:50 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile       Fri Aug 19 19:10:54 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2016/08/16 06:24:03 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2016/08/19 19:10:54 mrg Exp $
 
 DRIVER=                xf86-video-sunffb
 DRIVER_NAME=   sunffb_drv
@@ -21,4 +21,7 @@
 
 MAN=           sunffb.4
 
+# XXX
+COPTS.ffb_dac.c+=      -Wno-error=discarded-qualifiers
+
 .include "../Makefile.xf86-driver"
diff -r c9509d84aed6 -r 07a789cdbbc6 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Fri Aug 19 19:09:50 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Fri Aug 19 19:10:54 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2016/08/18 18:40:23 mrg Exp $
+#      $NetBSD: Makefile,v 1.25 2016/08/19 19:10:54 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -124,15 +124,7 @@
                                -DDRIVERS='"${DRIVERS}"' \
                                -DIDRIVERS='"${IDRIVERS}"'
 
-COPTS.xf86AutoConfig.c=                -Wno-error
-COPTS.xf86Config.c=            -Wno-error
-COPTS.xf86Configure.c=         -Wno-error
-COPTS.xf86Cursor.c=            -Wno-error
-COPTS.xf86RandR.c=             -Wno-error
-COPTS.xf86Helper.c=            -Wno-error
-COPTS.xf86cmap.c=              -Wno-error
-COPTS.xf86Cursor.c=            -Wno-error      # XXX xf86dgastr.h
-COPTS.xf86DGA.c=               -Wno-error      # XXX xf86dgastr.h
+COPTS.xf86sbusBus.c=           -Wno-error=incompatible-pointer-types
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>