[src/trunk]: src/external/mit/xorg/server Add defintions for ews4800mips and ...

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

details:   https://anonhg.NetBSD.org/src/rev/292e7347b6ce
branches:  trunk
changeset: 761854:292e7347b6ce
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Feb 09 13:37:48 2011 +0000

description:
Add defintions for ews4800mips and hp300 Xorg servers.

diffstat:

 external/mit/xorg/server/drivers/Makefile                       |  12 +++++++++-
 external/mit/xorg/server/xorg-server/Makefile.common            |   4 ++-
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile |  12 ++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diffs (77 lines):

diff -r aaa451e9905a -r 292e7347b6ce external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Wed Feb 09 13:24:23 2011 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Wed Feb 09 13:37:48 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.52 2011/01/02 11:24:20 mrg Exp $
+#      $NetBSD: Makefile,v 1.53 2011/02/09 13:37:48 tsutsui Exp $
 
 # xf86-input drivers
 
@@ -147,6 +147,16 @@
        xf86-video-wsfb
 .endif # ${MACHINE} == "dreamcast"
 
+.if ${MACHINE} == "ews4800mips"
+SUBDIR+= \
+       xf86-video-wsfb
+.endif # ${MACHINE} == "ews4800mips"
+
+.if ${MACHINE} == "hp300"
+SUBDIR+= \
+       xf86-video-wsfb
+.endif # ${MACHINE} == "hp300"
+
 .if ${MACHINE} == "hpcarm" || \
     ${MACHINE} == "hpcmips" || \
     ${MACHINE} == "hpcsh"
diff -r aaa451e9905a -r 292e7347b6ce external/mit/xorg/server/xorg-server/Makefile.common
--- a/external/mit/xorg/server/xorg-server/Makefile.common      Wed Feb 09 13:24:23 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.common      Wed Feb 09 13:37:48 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.common,v 1.19 2010/11/18 08:20:17 mrg Exp $
+#      $NetBSD: Makefile.common,v 1.20 2011/02/09 13:37:48 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -12,6 +12,8 @@
     ${MACHINE} == "bebox"      || \
     ${MACHINE} == "cats"       || \
     ${MACHINE} == "dreamcast"  || \
+    ${MACHINE} == "ews4800mips"        || \
+    ${MACHINE} == "hp300"      || \
     ${MACHINE} == "hpcarm"     || \
     ${MACHINE} == "hpcmips"    || \
     ${MACHINE} == "hpcsh"      || \
diff -r aaa451e9905a -r 292e7347b6ce external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Wed Feb 09 13:24:23 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Wed Feb 09 13:37:48 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.26 2010/11/29 09:34:41 skrll Exp $
+#      $NetBSD: Makefile,v 1.27 2011/02/09 13:37:48 tsutsui Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -54,7 +54,8 @@
 .endfor
 .endif
 
-.if ${MACHINE} == "hpcmips" || \
+.if ${MACHINE} == "ews4800mips" || \
+    ${MACHINE} == "hpcmips" || \
     ${MACHINE} == "sgimips"
 SRCS.bsd+=     ppc_video.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
@@ -84,6 +85,13 @@
 .endfor
 .endif
 
+.if ${MACHINE} == "hp300"
+SRCS.bsd+=     ppc_video.c pm_noop.c agp_noop.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}=       -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.endfor
+.endif
+
 # some platforms will probably need ioperm_noop.c
 
 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus