Module Name: src
Committed By: rin
Date: Sun Mar 7 10:42:27 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/distrib/sets/lists/xdebug: md.evbppc
src/distrib/sets/lists/xserver: md.evbppc
Log Message:
Build Xorg server for evbppc with minimum wsfb(4) support for Explora.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xdebug/md.evbppc
cvs rdiff -u -r0 -r1.4 src/distrib/sets/lists/xserver/md.evbppc
cvs rdiff -u -r1.100 -r1.101 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.39 -r1.40 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.48 -r1.49 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.1235 -r1.1236 src/share/mk/bsd.own.mk
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.100 src/external/mit/xorg/server/drivers/Makefile:1.101
--- src/external/mit/xorg/server/drivers/Makefile:1.100 Fri Oct 9 04:28:38 2020
+++ src/external/mit/xorg/server/drivers/Makefile Sun Mar 7 10:42:27 2021
@@ -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 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "evbmips"
+.if ${MACHINE} == "evbppc"
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "evbppc"
+
.if ${MACHINE} == "ews4800mips"
SUBDIR+= \
xf86-video-wsfb
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.39 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.40
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.39 Mon Nov 18 01:14:03 2019
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Sun Mar 7 10:42:27 2021
@@ -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 @@ SUBDIR= common ddc dixmods doc dri dri2
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
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.48 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.49
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.48 Fri Oct 9 17:01:29 2020
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sun Mar 7 10:42:27 2021
@@ -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 @@ CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCON
.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
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1235 src/share/mk/bsd.own.mk:1.1236
--- src/share/mk/bsd.own.mk:1.1235 Sun Dec 6 14:28:34 2020
+++ src/share/mk/bsd.own.mk Sun Mar 7 10:42:26 2021
@@ -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 @@ MKSLJIT= yes
${MACHINE} == "ews4800mips" || \
${MACHINE} == "evbarm" || \
${MACHINE} == "evbmips" || \
+ ${MACHINE} == "evbppc" || \
${MACHINE} == "hp300" || \
${MACHINE} == "hpcarm" || \
${MACHINE} == "hpcmips" || \
Added files:
Index: src/distrib/sets/lists/xdebug/md.evbppc
diff -u /dev/null src/distrib/sets/lists/xdebug/md.evbppc:1.1
--- /dev/null Sun Mar 7 10:42:27 2021
+++ src/distrib/sets/lists/xdebug/md.evbppc Sun Mar 7 10:42:26 2021
@@ -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
Index: src/distrib/sets/lists/xserver/md.evbppc
diff -u /dev/null src/distrib/sets/lists/xserver/md.evbppc:1.4
--- /dev/null Sun Mar 7 10:42:27 2021
+++ src/distrib/sets/lists/xserver/md.evbppc Sun Mar 7 10:42:27 2021
@@ -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
