Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Build a wsfb Xorg server for amiga.



details:   https://anonhg.NetBSD.org/src/rev/3f2facbe3713
branches:  trunk
changeset: 341401:3f2facbe3713
user:      phx <phx%NetBSD.org@localhost>
date:      Wed Nov 04 17:06:23 2015 +0000

description:
Build a wsfb Xorg server for amiga.

diffstat:

 distrib/sets/lists/xdebug/md.amiga                              |   22 ++-
 distrib/sets/lists/xserver/md.amiga                             |  103 +++++++++-
 external/mit/xorg/server/drivers/Makefile                       |    7 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile |    5 +-
 share/mk/bsd.own.mk                                             |    3 +-
 5 files changed, 134 insertions(+), 6 deletions(-)

diffs (199 lines):

diff -r 28f0d409041a -r 3f2facbe3713 distrib/sets/lists/xdebug/md.amiga
--- a/distrib/sets/lists/xdebug/md.amiga        Wed Nov 04 16:21:52 2015 +0000
+++ b/distrib/sets/lists/xdebug/md.amiga        Wed Nov 04 17:06:23 2015 +0000
@@ -1,3 +1,23 @@
-# $NetBSD: md.amiga,v 1.2 2015/08/10 19:23:32 mlelstv Exp $
+# $NetBSD: md.amiga,v 1.3 2015/11/04 17:06:23 phx Exp $
 ./usr/libdata/debug/usr/X11R6/bin/Xamiga.debug         -unknown-       x11,debug
 ./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug           -unknown-       x11,debug
+./usr/libdata/debug/usr/X11R7/bin/Xorg.debug   -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug    -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/gtf.debug    -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug   -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug    -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug  -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug        -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libextmod.so.0.debug      -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libglx.so.0.debug -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/librecord.so.0.debug      -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libshadow.so.0.debug      -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/libexa.so.0.debug    -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug     -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/libshadowfb.so.0.debug       -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug    -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug  -unknown-       debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug    -unknown-       debug,xorg
diff -r 28f0d409041a -r 3f2facbe3713 distrib/sets/lists/xserver/md.amiga
--- a/distrib/sets/lists/xserver/md.amiga       Wed Nov 04 16:21:52 2015 +0000
+++ b/distrib/sets/lists/xserver/md.amiga       Wed Nov 04 17:06:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amiga,v 1.21 2009/02/09 16:28:54 abs Exp $
+# $NetBSD: md.amiga,v 1.22 2015/11/04 17:06:23 phx Exp $
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/Xamiga                                 -unknown-       x11
 ./usr/X11R6/lib/modules/libafb.a                       -obsolete-      obsolete
@@ -8,3 +8,104 @@
 ./usr/X11R6/man/html1/Xamiga24.html                    -unknown-       html,x11
 ./usr/X11R6/man/man1/Xamiga.1                          -unknown-       .man,x11
 ./usr/X11R6/man/man1/Xamiga24.1                                -unknown-       .man,x11
+./usr/X11R7/bin/X                                      -unknown-       xorg
+./usr/X11R7/bin/Xorg                                   -unknown-       xorg
+./usr/X11R7/bin/cvt                                    -unknown-       xorg
+./usr/X11R7/bin/gtf                                    -unknown-       xorg
+./usr/X11R7/lib/X11/doc/README.modes                   -unknown-       xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so             -unknown-       xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.1           -unknown-       xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so           -unknown-       xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so.1         -unknown-       xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so              -unknown-       xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so.1            -unknown-       xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so            -unknown-       xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0          -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libdbe.a            -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdbe.so           -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so.0         -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libdbe_pic.a                -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libdri.a            -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libdri.so           -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libdri.so.0         -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libdri2.a           -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so          -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so.0                -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libdri2_pic.a       -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libdri_pic.a                -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod.a         -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod.so                -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so.0      -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libextmod_pic.a     -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libglx.a            -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libglx.so           -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0         -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libglx_pic.a                -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/librecord.a         -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/extensions/librecord.so                -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/librecord.so.0      -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/librecord_pic.a     -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow.a         -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow.so                -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so.0      -unknown-       xorg
+./usr/X11R7/lib/modules/extensions/libshadow_pic.a     -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libexa.a                       -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/libexa.so                      -unknown-       xorg
+./usr/X11R7/lib/modules/libexa.so.0                    -unknown-       xorg
+./usr/X11R7/lib/modules/libexa_pic.a                   -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libfb.a                                -unknown-       xorg
+./usr/X11R7/lib/modules/libfb.so                       -unknown-       xorg
+./usr/X11R7/lib/modules/libfb.so.0                     -unknown-       xorg
+./usr/X11R7/lib/modules/libfb_pic.a                    -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libi2c.a                       -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/libi2c.so                      -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/libi2c.so.0                    -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/libi2c_pic.a                   -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libshadowfb.a                  -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb.so                 -unknown-       xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0               -unknown-       xorg
+./usr/X11R7/lib/modules/libshadowfb_pic.a              -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libvbe.a                       -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/libvbe.so                      -unknown-       xorg
+./usr/X11R7/lib/modules/libvbe.so.0                    -unknown-       xorg
+./usr/X11R7/lib/modules/libvbe_pic.a                   -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libvgahw.a                     -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/libvgahw.so                    -unknown-       xorg
+./usr/X11R7/lib/modules/libvgahw.so.0                  -unknown-       xorg
+./usr/X11R7/lib/modules/libvgahw_pic.a                 -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libxaa.a                       -unknown-       xorg,obsolete
+./usr/X11R7/lib/modules/libxaa.so                      -unknown-       xorg
+./usr/X11R7/lib/modules/libxaa.so.0                    -unknown-       xorg
+./usr/X11R7/lib/modules/libxaa_pic.a                   -unknown-       xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.a                 -unknown-       obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.so                        -unknown-       obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.so.0              -unknown-       obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp_pic.a             -unknown-       obsolete
+./usr/X11R7/man/cat1/Xorg.0                            -unknown-       .cat,xorg
+./usr/X11R7/man/cat1/cvt.0                             -unknown-       .cat,xorg
+./usr/X11R7/man/cat1/gtf.0                             -unknown-       .cat,xorg
+./usr/X11R7/man/cat4/exa.0                             -unknown-       .cat,xorg
+./usr/X11R7/man/cat4/kbd.0                             -unknown-       .cat,xorg
+./usr/X11R7/man/cat4/mousedrv.0                                -unknown-       .cat,xorg
+./usr/X11R7/man/cat4/ws.0                              -unknown-       .cat,xorg
+./usr/X11R7/man/cat4/wsfb.0                            -unknown-       .cat,xorg
+./usr/X11R7/man/cat5/xorg.conf.0                       -unknown-       .cat,xorg
+./usr/X11R7/man/html1/Xorg.html                                -unknown-       html,xorg
+./usr/X11R7/man/html1/cvt.html                         -unknown-       html,xorg
+./usr/X11R7/man/html1/gtf.html                         -unknown-       html,xorg
+./usr/X11R7/man/html4/exa.html                         -unknown-       html,xorg
+./usr/X11R7/man/html4/kbd.html                         -unknown-       html,xorg
+./usr/X11R7/man/html4/mousedrv.html                    -unknown-       html,xorg
+./usr/X11R7/man/html4/ws.html                          -unknown-       html,xorg
+./usr/X11R7/man/html4/wsfb.html                                -unknown-       html,xorg
+./usr/X11R7/man/html5/xorg.conf.html                   -unknown-       html,xorg
+./usr/X11R7/man/man1/Xorg.1                            -unknown-       .man,xorg
+./usr/X11R7/man/man1/cvt.1                             -unknown-       .man,xorg
+./usr/X11R7/man/man1/gtf.1                             -unknown-       .man,xorg
+./usr/X11R7/man/man4/exa.4                             -unknown-       .man,xorg
+./usr/X11R7/man/man4/kbd.4                             -unknown-       .man,xorg
+./usr/X11R7/man/man4/mousedrv.4                                -unknown-       .man,xorg
+./usr/X11R7/man/man4/ws.4                              -unknown-       .man,xorg
+./usr/X11R7/man/man4/wsfb.4                            -unknown-       .man,xorg
+./usr/X11R7/man/man5/xorg.conf.5                       -unknown-       .man,xorg
+./usr/X11R7/share/aclocal/xorg-server.m4               -unknown-       xorg
diff -r 28f0d409041a -r 3f2facbe3713 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Wed Nov 04 16:21:52 2015 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Wed Nov 04 17:06:23 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.72 2015/10/19 15:09:39 macallan Exp $
+#      $NetBSD: Makefile,v 1.73 2015/11/04 17:06:23 phx Exp $
 
 # xf86-input drivers
 
@@ -106,6 +106,11 @@
 #      xf86-video-imstt
 .endif # ${MACHINE} == "alpha"
 
+.if ${MACHINE} == "amiga"
+SUBDIR+= \
+       xf86-video-wsfb
+.endif # ${MACHINE} == "amiga"
+
 .if ${MACHINE} == "bebox"
 SUBDIR+= \
        xf86-video-cirrus \
diff -r 28f0d409041a -r 3f2facbe3713 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Wed Nov 04 16:21:52 2015 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Wed Nov 04 17:06:23 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.39 2015/10/13 19:43:44 rjs Exp $
+#      $NetBSD: Makefile,v 1.40 2015/11/04 17:06:23 phx Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -89,7 +89,8 @@
 .endfor
 .endif
 
-.if ${MACHINE} == "hp300" || \
+.if ${MACHINE} == "amiga" || \
+    ${MACHINE} == "hp300" || \
     ${MACHINE} == "luna68k" || \
     ${MACHINE} == "mac68k"
 SRCS.bsd+=     ppc_video.c pm_noop.c agp_noop.c
diff -r 28f0d409041a -r 3f2facbe3713 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Wed Nov 04 16:21:52 2015 +0000
+++ b/share/mk/bsd.own.mk       Wed Nov 04 17:06:23 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.877 2015/10/19 16:17:14 pooka Exp $
+#      $NetBSD: bsd.own.mk,v 1.878 2015/11/04 17:06:23 phx Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1037,6 +1037,7 @@
 #
 .if ${MACHINE} == "alpha"      || \
     ${MACHINE} == "amd64"      || \
+    ${MACHINE} == "amiga"      || \
     ${MACHINE} == "bebox"      || \
     ${MACHINE} == "cats"       || \
     ${MACHINE} == "dreamcast"  || \



Home | Main Index | Thread Index | Old Index