Module Name: src
Committed By: macallan
Date: Tue Aug 30 04:22:57 UTC 2011
Modified Files:
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/xorgos: Makefile
Log Message:
build Xorg and some drivers appropriate for Loongson-based hw on evbmips
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.30 -r1.31 \
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/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.59 src/external/mit/xorg/server/drivers/Makefile:1.60
--- src/external/mit/xorg/server/drivers/Makefile:1.59 Thu Jul 21 10:20:25 2011
+++ src/external/mit/xorg/server/drivers/Makefile Tue Aug 30 04:22:56 2011
@@ -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
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.22 src/external/mit/xorg/server/xorg-server/Makefile.common:1.23
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.22 Thu Jul 21 10:20:25 2011
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Tue Aug 30 04:22:56 2011
@@ -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" || \
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.30 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.31
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.30 Thu Jul 21 10:20:25 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Tue Aug 30 04:22:56 2011
@@ -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
