[src/trunk]: src Support xserver for bebox.

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

details:   https://anonhg.NetBSD.org/src/rev/85f571ccc2d8
branches:  trunk
changeset: 756774:85f571ccc2d8
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sun Aug 01 06:24:30 2010 +0000

description:
Support xserver for bebox.

diffstat:

 doc/CHANGES                                                     |   4 +++-
 external/mit/xorg/lib/dri/Makefile                              |   4 ++--
 external/mit/xorg/server/drivers/Makefile                       |  10 +++++++++-
 external/mit/xorg/server/xorg-server/Makefile.common            |   3 ++-
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile  |   4 ++--
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile |   9 +++++----
 6 files changed, 23 insertions(+), 11 deletions(-)

diffs (129 lines):

diff -r 260992e0755b -r 85f571ccc2d8 doc/CHANGES
--- a/doc/CHANGES       Sun Aug 01 06:15:03 2010 +0000
+++ b/doc/CHANGES       Sun Aug 01 06:24:30 2010 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:                   <$Revision: 1.1423 $>
+# LIST OF CHANGES FROM LAST RELEASE:                   <$Revision: 1.1424 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -697,3 +697,5 @@
        i386: Add PAE support. [jym 20100727]
        hpcarm, hpcmips, hpcsh: Switch to using Xorg servers and binaries.
                [tsutsui 20100731]
+       bebox: Support xserver.  It tested only s3(TRIO 64V+).
+               [kiyohara 20100801]
diff -r 260992e0755b -r 85f571ccc2d8 external/mit/xorg/lib/dri/Makefile
--- a/external/mit/xorg/lib/dri/Makefile        Sun Aug 01 06:15:03 2010 +0000
+++ b/external/mit/xorg/lib/dri/Makefile        Sun Aug 01 06:24:30 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/07/12 07:54:12 kiyohara Exp $
+# $NetBSD: Makefile,v 1.16 2010/08/01 06:24:30 kiyohara Exp $
 
 SUBDIR=                libmesa .WAIT
 
@@ -11,7 +11,7 @@
 .elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=       i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
        savage sis tdfx unichrome
-.elif ${MACHINE} == "prep"
+.elif ${MACHINE} == "prep" || ${MACHINE} == "bebox"
 SUBDIR+=       mga
 .endif
 
diff -r 260992e0755b -r 85f571ccc2d8 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Sun Aug 01 06:15:03 2010 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Sun Aug 01 06:24:30 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.45 2010/07/12 07:54:12 kiyohara Exp $
+#      $NetBSD: Makefile,v 1.46 2010/08/01 06:24:31 kiyohara Exp $
 
 SUBDIR= \
        xf86-input-keyboard \
@@ -177,6 +177,14 @@
        xf86-video-mga \
        xf86-video-s3 \
        xf86-video-vga
+.elif ${MACHINE} == "bebox"
+SUBDIR+= \
+       xf86-video-cirrus \
+       xf86-video-cirrus_alpine \
+       xf86-video-mga \
+       xf86-video-s3 \
+       xf86-video-s3virge \
+       xf86-video-vga
 .endif
 
 # broken with xorg-server 1.6
diff -r 260992e0755b -r 85f571ccc2d8 external/mit/xorg/server/xorg-server/Makefile.common
--- a/external/mit/xorg/server/xorg-server/Makefile.common      Sun Aug 01 06:15:03 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.common      Sun Aug 01 06:24:30 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.common,v 1.17 2010/07/31 15:01:12 tsutsui Exp $
+#      $NetBSD: Makefile.common,v 1.18 2010/08/01 06:24:31 kiyohara Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -9,6 +9,7 @@
 .if \
     ${MACHINE} == "alpha"      || \
     ${MACHINE} == "amd64"      || \
+    ${MACHINE} == "bebox"      || \
     ${MACHINE} == "cats"       || \
     ${MACHINE} == "dreamcast"  || \
     ${MACHINE} == "hpcarm"     || \
diff -r 260992e0755b -r 85f571ccc2d8 external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile    Sun Aug 01 06:15:03 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile    Sun Aug 01 06:24:30 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2010/07/12 07:54:12 kiyohara Exp $
+#      $NetBSD: Makefile,v 1.14 2010/08/01 06:24:31 kiyohara Exp $
 
 SUBDIR=        cvt gtf
 #SUBDIR=       cvt gtf xorgconfig
@@ -10,7 +10,7 @@
 .if ${MACHINE} == "cats" || ${MACHINE} == "macppc" || \
     ${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
     ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE} == "prep"
+    ${MACHINE} == "prep" || ${MACHINE} == "bebox"
 #SUBDIR+=pcitweak scanpci
 .endif
 
diff -r 260992e0755b -r 85f571ccc2d8 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Sun Aug 01 06:15:03 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Sun Aug 01 06:24:30 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2010/07/12 07:54:12 kiyohara Exp $
+#      $NetBSD: Makefile,v 1.23 2010/08/01 06:24:31 kiyohara Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -32,7 +32,7 @@
 .endfor
 .endif
 
-.if ${MACHINE} == "macppc" || ${MACHINE} == "prep"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox"
 SRCS.bsd+=     ppc_video.c stdResource.c pm_noop.c lnx_agp.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=       -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@@ -91,7 +91,7 @@
     ${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
     ${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
     ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE} == "prep"
+    ${MACHINE} == "prep" || ${MACHINE} == "bebox"
 #SRCS.bus+=    netbsdPci.c
 .endif
 
@@ -115,7 +115,8 @@
        ${MACHINE} == "sgimips" || ${MACHINE_ARCH} == "sparc64" || \
        ${MACHINE_ARCH} == "sparc" || ${MACHINE} == "netwinder" || \
        ${MACHINE} == "shark" || ${MACHINE} == "ofppc" || \
-       ${MACHINE_ARCH} == "alpha" || ${MACHINE} == "prep"
+       ${MACHINE_ARCH} == "alpha" || ${MACHINE} == "prep" || \
+       ${MACHINE} == "bebox"
 #SRCS.misc+=     CBUSmemcpy.c CIODelay.c CSlowBcopy.c
 .endif