Module Name: src
Committed By: kiyohara
Date: Sun Aug 1 06:24:31 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
Support xserver for bebox.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.45 -r1.46 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/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/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.15 src/external/mit/xorg/lib/dri/Makefile:1.16
--- src/external/mit/xorg/lib/dri/Makefile:1.15 Mon Jul 12 07:54:12 2010
+++ src/external/mit/xorg/lib/dri/Makefile Sun Aug 1 06:24:30 2010
@@ -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
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.45 src/external/mit/xorg/server/drivers/Makefile:1.46
--- src/external/mit/xorg/server/drivers/Makefile:1.45 Mon Jul 12 07:54:12 2010
+++ src/external/mit/xorg/server/drivers/Makefile Sun Aug 1 06:24:31 2010
@@ -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
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.17 src/external/mit/xorg/server/xorg-server/Makefile.common:1.18
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.17 Sat Jul 31 15:01:12 2010
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Sun Aug 1 06:24:31 2010
@@ -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" || \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.13 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.13 Mon Jul 12 07:54:12 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Sun Aug 1 06:24:31 2010
@@ -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
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.22 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.23
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.22 Mon Jul 12 07:54:12 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sun Aug 1 06:24:31 2010
@@ -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
