[src/trunk]: src/external/mit/xorg/server build Xorg and some drivers appropr...

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

details:   https://anonhg.NetBSD.org/src/rev/22e35b8cf06f
branches:  trunk
changeset: 768996:22e35b8cf06f
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue Aug 30 04:22:56 2011 +0000

description:
build Xorg and some drivers appropriate for Loongson-based hw on evbmips

diffstat:

 external/mit/xorg/server/drivers/Makefile                       |  11 ++++++++-
 external/mit/xorg/server/xorg-server/Makefile.common            |   3 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile |   5 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r f9feb62b5d21 -r 22e35b8cf06f external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Tue Aug 30 02:58:04 2011 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Tue Aug 30 04:22:56 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.59 2011/07/21 10:20:25 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.60 2011/08/30 04:22:56 macallan Exp $
 
 # xf86-input drivers
 
@@ -147,6 +147,13 @@
        xf86-video-wsfb
 .endif # ${MACHINE} == "dreamcast"
 
+.if ${MACHINE} == "evbmips"
+SUBDIR+= \
+       xf86-video-siliconmotion \
+       xf86-video-sis \
+       xf86-video-wsfb
+.endif # ${MACHINE} == "evbmips"
+
 .if ${MACHINE} == "ews4800mips"
 SUBDIR+= \
        xf86-video-wsfb
@@ -254,7 +261,7 @@
 .if ${MACHINE} == "zaurus"
 SUBDIR+= \
        xf86-video-wsfb
-.endif ${MACHINE} == "zaurus"
+.endif # ${MACHINE} == "zaurus"
 
 # broken with xorg-server 1.6
 # x86
diff -r f9feb62b5d21 -r 22e35b8cf06f external/mit/xorg/server/xorg-server/Makefile.common
--- a/external/mit/xorg/server/xorg-server/Makefile.common      Tue Aug 30 02:58:04 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.common      Tue Aug 30 04:22:56 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.common,v 1.22 2011/07/21 10:20:25 tsutsui Exp $
+#      $NetBSD: Makefile.common,v 1.23 2011/08/30 04:22:56 macallan Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -13,6 +13,7 @@
     ${MACHINE} == "cats"       || \
     ${MACHINE} == "dreamcast"  || \
     ${MACHINE} == "ews4800mips"        || \
+    ${MACHINE} == "evbmips"    || \
     ${MACHINE} == "hp300"      || \
     ${MACHINE} == "hpcarm"     || \
     ${MACHINE} == "hpcmips"    || \
diff -r f9feb62b5d21 -r 22e35b8cf06f external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Tue Aug 30 02:58:04 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Tue Aug 30 04:22:56 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2011/07/21 10:20:25 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.31 2011/08/30 04:22:56 macallan Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -60,7 +60,8 @@
 .if ${MACHINE} == "ews4800mips" || \
     ${MACHINE} == "hpcmips" || \
     ${MACHINE} == "newsmips" || \
-    ${MACHINE} == "sgimips"
+    ${MACHINE} == "sgimips" || \
+    ${MACHINE} == "evbmips"
 SRCS.bsd+=     ppc_video.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=       -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC