Module Name: src
Committed By: mrg
Date: Fri Aug 19 19:10:54 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Log Message:
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.)
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.78 src/external/mit/xorg/server/drivers/Makefile:1.79
--- src/external/mit/xorg/server/drivers/Makefile:1.78 Fri Aug 19 03:59:30 2016
+++ src/external/mit/xorg/server/drivers/Makefile Fri Aug 19 19:10:54 2016
@@ -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 @@ SUBDIR+= \
.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-sunffb \
- xf86-video-sunleo \
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
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.if ${MACHINE} == "sparc"
SUBDIR+= \
xf86-video-pnozz \
Index: src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.5 Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Fri Aug 19 19:10:54 2016
@@ -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 @@ CPPFLAGS+= ${X11FLAGS.DRI}
MAN= suncg6.4
+# XXX
+COPTS.cg6_accel.c+= -Wno-error=discarded-qualifiers
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.7 Tue Aug 16 06:24:03 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Fri Aug 19 19:10:54 2016
@@ -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 @@ CPPFLAGS+= ${X11FLAGS.DRI} -DUSE_VIS
MAN= sunffb.4
+# XXX
+COPTS.ffb_dac.c+= -Wno-error=discarded-qualifiers
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.24 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.25
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.24 Thu Aug 18 18:40:23 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Fri Aug 19 19:10:54 2016
@@ -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 @@ CPPFLAGS.xf86AutoConfig.c= -DPROJECTROOT
-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>
