Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk Build Xorg server for evbppc with minimum wsfb(4) s...
details: https://anonhg.NetBSD.org/src/rev/5bcff1a15af8
branches: trunk
changeset: 960069:5bcff1a15af8
user: rin <rin%NetBSD.org@localhost>
date: Sun Mar 07 10:42:26 2021 +0000
description:
Build Xorg server for evbppc with minimum wsfb(4) support for Explora.
diffstat:
distrib/sets/lists/xdebug/md.evbppc | 24 +++
distrib/sets/lists/xserver/md.evbppc | 71 ++++++++++
external/mit/xorg/server/drivers/Makefile | 7 +-
external/mit/xorg/server/xorg-server/hw/xfree86/Makefile | 5 +-
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile | 12 +-
share/mk/bsd.own.mk | 3 +-
6 files changed, 114 insertions(+), 8 deletions(-)
diffs (186 lines):
diff -r 86f4cb0a64d6 -r 5bcff1a15af8 distrib/sets/lists/xdebug/md.evbppc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/xdebug/md.evbppc Sun Mar 07 10:42:26 2021 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: md.evbppc,v 1.1 2021/03/07 10:42:26 rin Exp $
+./usr/libdata/debug/usr/X11R7/bin/Xorg.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/Xorg.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug xdebug-xf86-input-keyboard-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug xdebug-xf86-input-mouse-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug xdebug-xf86-input-ws-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug xdebug-xf86-video-wsfb-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug xdebug-dri-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug xdebug-dri2-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libextmod.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libglx.so.0.debug xdebug-glx-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/librecord.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libshadow.so.0.debug xdebug-shadow-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libexa.so.0.debug xdebug-exa-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug xdebug-dixmods-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libshadowfb.so.0.debug xdebug-shadowfb-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug xdebug-vbe-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug xdebug-vgahw-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
diff -r 86f4cb0a64d6 -r 5bcff1a15af8 distrib/sets/lists/xserver/md.evbppc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/xserver/md.evbppc Sun Mar 07 10:42:26 2021 +0000
@@ -0,0 +1,71 @@
+# $NetBSD: md.evbppc,v 1.4 2021/03/07 10:42:27 rin Exp $
+./usr/X11R7/bin/X xserver-xorg-server-bin xorg
+./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg
+./usr/X11R7/bin/cvt xserver-xorg-server-bin xorg
+./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg
+./usr/X11R7/lib/X11/doc/README.modes xserver-xorg-server-lib xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so xserver-xf86-input-keyboard-drivers xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 xserver-xf86-input-keyboard-drivers xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so xserver-xf86-input-mouse-drivers xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 xserver-xf86-input-mouse-drivers xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so xserver-xf86-input-ws-drivers xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so.1 xserver-xf86-input-ws-drivers xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so xserver-xf86-video-wsfb-drivers xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 xserver-xf86-video-wsfb-drivers xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libdri.a xserver-dri-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri.so xserver-dri-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri.so.0 xserver-dri-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri2.a xserver-dri2-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so xserver-dri2-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so.0 xserver-dri2-modules xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libglx.so xserver-glx-modules xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0 xserver-glx-modules xorg
+./usr/X11R7/lib/modules/extensions/librecord.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libshadow.so xserver-shadow-modules xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so.0 xserver-shadow-modules xorg
+./usr/X11R7/lib/modules/libexa.so xserver-exa-modules xorg
+./usr/X11R7/lib/modules/libexa.so.0 xserver-exa-modules xorg
+./usr/X11R7/lib/modules/libfb.a xserver-dixmods-modules xorg
+./usr/X11R7/lib/modules/libfb.so xserver-dixmods-modules xorg
+./usr/X11R7/lib/modules/libfb.so.0 xserver-dixmods-modules xorg
+./usr/X11R7/lib/modules/libshadowfb.so xserver-shadowfb-modules xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0 xserver-shadowfb-modules xorg
+./usr/X11R7/lib/modules/libvbe.so xserver-vbe-modules xorg
+./usr/X11R7/lib/modules/libvbe.so.0 xserver-vbe-modules xorg
+./usr/X11R7/lib/modules/libvgahw.so xserver-vgahw-modules xorg
+./usr/X11R7/lib/modules/libvgahw.so.0 xserver-vgahw-modules xorg
+./usr/X11R7/lib/modules/libxaa.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/libxaa.so.0 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/man/cat1/Xorg.0 xserver-xorg-server-catman .cat,xorg
+./usr/X11R7/man/cat1/cvt.0 xserver-xorg-server-catman .cat,xorg
+./usr/X11R7/man/cat1/gtf.0 xserver-xorg-server-catman .cat,xorg
+./usr/X11R7/man/cat4/exa.0 xserver-xf86-video-exa-catman .cat,xorg
+./usr/X11R7/man/cat4/kbd.0 xserver-xf86-input-keyboard-catman .cat,xorg
+./usr/X11R7/man/cat4/mousedrv.0 xserver-xf86-input-mouse-catman .cat,xorg
+./usr/X11R7/man/cat4/ws.0 xserver-xf86-input-ws-catman .cat,xorg
+./usr/X11R7/man/cat4/wsfb.0 xserver-xf86-video-wsfb-catman .cat,xorg
+./usr/X11R7/man/cat5/xorg.conf.0 xserver-xorg-server-catman .cat,xorg
+./usr/X11R7/man/html1/Xorg.html xserver-xorg-server-htmlman html,xorg
+./usr/X11R7/man/html1/cvt.html xserver-xorg-server-htmlman html,xorg
+./usr/X11R7/man/html1/gtf.html xserver-xorg-server-htmlman html,xorg
+./usr/X11R7/man/html4/exa.html xserver-xf86-video-exa-htmlman html,xorg
+./usr/X11R7/man/html4/kbd.html xserver-xf86-input-keyboard-htmlman html,xorg
+./usr/X11R7/man/html4/mousedrv.html xserver-xf86-input-mouse-htmlman html,xorg
+./usr/X11R7/man/html4/ws.html xserver-xf86-input-ws-htmlman html,xorg
+./usr/X11R7/man/html4/wsfb.html xserver-xf86-video-wsfb-htmlman html,xorg
+./usr/X11R7/man/html5/xorg.conf.html xserver-xorg-server-htmlman html,xorg
+./usr/X11R7/man/man1/Xorg.1 xserver-xorg-server-man .man,xorg
+./usr/X11R7/man/man1/cvt.1 xserver-xorg-server-man .man,xorg
+./usr/X11R7/man/man1/gtf.1 xserver-xorg-server-man .man,xorg
+./usr/X11R7/man/man4/exa.4 xserver-xf86-video-exa-man .man,xorg
+./usr/X11R7/man/man4/kbd.4 xserver-xf86-input-keyboard-man .man,xorg
+./usr/X11R7/man/man4/mousedrv.4 xserver-xf86-input-mouse-man .man,xorg
+./usr/X11R7/man/man4/ws.4 xserver-xf86-input-ws-man .man,xorg
+./usr/X11R7/man/man4/wsfb.4 xserver-xf86-video-wsfb-man .man,xorg
+./usr/X11R7/man/man5/xorg.conf.5 xserver-xorg-server-man .man,xorg
+./usr/X11R7/share/aclocal/xorg-server.m4 xserver-xorg-server-share xorg
diff -r 86f4cb0a64d6 -r 5bcff1a15af8 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Sun Mar 07 10:33:07 2021 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Sun Mar 07 10:42:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2020/10/09 04:28:38 macallan Exp $
+# $NetBSD: Makefile,v 1.101 2021/03/07 10:42:27 rin Exp $
.include <bsd.own.mk>
@@ -195,6 +195,11 @@
xf86-video-wsfb
.endif # ${MACHINE} == "evbmips"
+.if ${MACHINE} == "evbppc"
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "evbppc"
+
.if ${MACHINE} == "ews4800mips"
SUBDIR+= \
xf86-video-wsfb
diff -r 86f4cb0a64d6 -r 5bcff1a15af8 external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Sun Mar 07 10:33:07 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Sun Mar 07 10:42:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/11/18 01:14:03 mrg Exp $
+# $NetBSD: Makefile,v 1.40 2021/03/07 10:42:27 rin Exp $
.include <bsd.own.mk>
@@ -8,7 +8,8 @@
x86emu xf86config xkb \
drivers
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_CPU} == "powerpc"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+ (${MACHINE_CPU} == "powerpc" && ${MACHINE} != "evbppc")
SUBDIR+= int10
.endif
diff -r 86f4cb0a64d6 -r 5bcff1a15af8 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sun Mar 07 10:33:07 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sun Mar 07 10:42:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2020/10/09 17:01:29 macallan Exp $
+# $NetBSD: Makefile,v 1.49 2021/03/07 10:42:27 rin Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -35,9 +35,13 @@
.endfor
.endif
-.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || \
- ${MACHINE} == "ibmnws" || ${MACHINE} == "hppa"
-SRCS.bsd+= ppc_video.c pm_noop.c lnx_agp.c
+.if ${MACHINE_CPU} == "powerpc" || ${MACHINE} == "hppa"
+SRCS.bsd+= ppc_video.c pm_noop.c
+. if ${MACHINE} != "evbppc"
+SRCS.bsd+= lnx_agp.c
+. else
+SRCS.bsd+= agp_noop.c
+. endif
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
diff -r 86f4cb0a64d6 -r 5bcff1a15af8 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Sun Mar 07 10:33:07 2021 +0000
+++ b/share/mk/bsd.own.mk Sun Mar 07 10:42:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1235 2020/12/06 14:28:34 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1236 2021/03/07 10:42:26 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1309,6 +1309,7 @@
${MACHINE} == "ews4800mips" || \
${MACHINE} == "evbarm" || \
${MACHINE} == "evbmips" || \
+ ${MACHINE} == "evbppc" || \
${MACHINE} == "hp300" || \
${MACHINE} == "hpcarm" || \
${MACHINE} == "hpcmips" || \
Home |
Main Index |
Thread Index |
Old Index