qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build the X server on hp300 again. Tested on catseye.

Browse Source
This commit is contained in:
miod 2013-03-14 20:49:52 +00:00
parent bf001e1b53
commit 80ae22700e
6 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
distrib/notes/README.hp300
View File

@ -1,8 +1,21 @@
Post-installation instructions for X.Org on OpenBSD/hp300
---------------------------------------------------------
There is no X server for hp300. Only userland X.
OpenBSD use the X.Org X server on hp300.
An unaccelerated frame buffer driver, wsfb, is provided for all frame
buffers but those on the SGC bus (including the 425e built-in EVRX).
DaVinci and Renaissance frame buffers are currently only supported
in monochrome mode.
No xorg.conf is needed in this configuration, unless you want to
change default options.
To start xdm, the X display manager, activate the xdm_flags option in
/etc/rc.conf. You will need to disable the console getty in /etc/ttys.
Alternatively, you can log in on console and use `startx'.
problem_blurb
$OpenBSD: README.hp300,v 1.3 2012/02/07 19:53:13 matthieu Exp $
$OpenBSD: README.hp300,v 1.4 2013/03/14 20:49:52 miod Exp $

14
distrib/sets/lists/xbase/md.hp300
View File

@ -11,20 +11,26 @@
./usr/X11R6/include/GL/glu.h
./usr/X11R6/include/GL/glx.h
./usr/X11R6/include/GL/glxext.h
./usr/X11R6/include/GL/internal/dri_interface.h
./usr/X11R6/include/GL/osmesa.h
./usr/X11R6/include/X11/dri/xf86dri.h
./usr/X11R6/include/X11/dri/xf86driproto.h
./usr/X11R6/include/X11/dri/xf86dristr.h
./usr/X11R6/include/X11/extensions/dri2proto.h
./usr/X11R6/include/X11/extensions/dri2tokens.h
./usr/X11R6/include/pixman-1/pixman-version.h
./usr/X11R6/include/pixman-1/pixman.h
./usr/X11R6/include/xf86drm.h
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/compositeext.h
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
./usr/X11R6/include/xorg/events.h
./usr/X11R6/include/xorg/fbpict.h
./usr/X11R6/include/xorg/geext.h
./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/joystick-properties.h
./usr/X11R6/include/xorg/list.h
./usr/X11R6/include/xorg/mioverlay.h
./usr/X11R6/include/xorg/optionstr.h
@ -34,6 +40,7 @@
./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/vidmodeproc.h
./usr/X11R6/include/xorg/ws-properties.h
@ -85,6 +92,8 @@
./usr/X11R6/lib/libXxf86misc.so.5.0
./usr/X11R6/lib/libXxf86vm.so.5.0
./usr/X11R6/lib/libdmx.so.1.0
./usr/X11R6/lib/libdrm.a
./usr/X11R6/lib/libdrm.so.3.1
./usr/X11R6/lib/libfontconfig.so.7.0
./usr/X11R6/lib/libfontenc.so.3.0
./usr/X11R6/lib/libfreetype.so.19.0
@ -131,8 +140,9 @@
./usr/X11R6/lib/pkgconfig/gl.pc
./usr/X11R6/lib/pkgconfig/glu.pc
./usr/X11R6/lib/pkgconfig/glw.pc
./usr/X11R6/lib/pkgconfig/libdrm.pc
./usr/X11R6/lib/pkgconfig/pixman-1.pc
./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
./usr/X11R6/lib/pkgconfig/xf86driproto.pc
./usr/X11R6/lib/xorg/protocol.txt
./usr/X11R6/man/man1/bdftruncate.1
./usr/X11R6/man/man1/glxgears.1

1
distrib/sets/lists/xetc/md.hp300
View File

@ -1,2 +1 @@
./etc/X11/fs/config
./etc/X11/xorg.conf

26
distrib/sets/lists/xserv/md.hp300
View File

@ -1,4 +1,5 @@
./usr/X11R6/bin/X
./usr/X11R6/bin/Xephyr
./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
@ -8,11 +9,10 @@
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/Xprintf.h
./usr/X11R6/include/xorg/bt829.h
./usr/X11R6/include/xorg/callback.h
./usr/X11R6/include/xorg/cfb8_16.h
./usr/X11R6/include/xorg/client.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@ -65,6 +65,8 @@
./usr/X11R6/include/xorg/miscstruct.h
./usr/X11R6/include/xorg/mispans.h
./usr/X11R6/include/xorg/mistruct.h
./usr/X11R6/include/xorg/misync.h
./usr/X11R6/include/xorg/misyncstr.h
./usr/X11R6/include/xorg/miwideline.h
./usr/X11R6/include/xorg/mizerarc.h
./usr/X11R6/include/xorg/msp3430.h
@ -90,6 +92,7 @@
./usr/X11R6/include/xorg/site.h
./usr/X11R6/include/xorg/swaprep.h
./usr/X11R6/include/xorg/swapreq.h
./usr/X11R6/include/xorg/syncsdk.h
./usr/X11R6/include/xorg/tda8425.h
./usr/X11R6/include/xorg/tda9850.h
./usr/X11R6/include/xorg/tda9885.h
@ -102,11 +105,11 @@
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
./usr/X11R6/include/xorg/xaa.h
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
./usr/X11R6/include/xorg/xf86-mouse-properties.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Cursor.h
@ -141,12 +144,21 @@
./usr/X11R6/include/xorg/xorgVersion.h
./usr/X11R6/include/xorg/xvdix.h
./usr/X11R6/include/xorg/xvmcext.h
./usr/X11R6/lib/modules/dri/swrast_dri.so
./usr/X11R6/lib/modules/drivers/wsfb_drv.la
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
./usr/X11R6/lib/modules/extensions/libdbe.la
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
./usr/X11R6/lib/modules/extensions/libdri2.la
./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
./usr/X11R6/lib/modules/extensions/librecord.la
./usr/X11R6/lib/modules/extensions/librecord.so
./usr/X11R6/lib/modules/input/kbd_drv.la
./usr/X11R6/lib/modules/input/kbd_drv.so
./usr/X11R6/lib/modules/input/mouse_drv.la
@ -177,8 +189,6 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@ -193,7 +203,9 @@
./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
./usr/X11R6/lib/pkgconfig/xorg-mouse.pc
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
@ -263,8 +275,8 @@
./usr/X11R6/man/man4/ws.4
./usr/X11R6/man/man4/wsfb.4
./usr/X11R6/man/man5/xorg.conf.5
./usr/X11R6/man/man5/xorg.conf.d.5
./usr/X11R6/share/aclocal/xorg-server.m4
./usr/X11R6/share/doc/xorg-server
./var/db/xkb
./var/db/xkb/README.compiled
./var/log

7
driver/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.52 2012/08/11 09:56:55 matthieu Exp $
# $OpenBSD: Makefile,v 1.53 2013/03/14 20:49:52 miod Exp $
INPUT_DRV_DEFAULT= \
xf86-input-keyboard \
@ -16,7 +16,7 @@ INPUT_DRV_alpha=
INPUT_DRV_amd64= ${INPUT_DRV_COMMON} xf86-input-synaptics xf86-input-vmmouse
INPUT_DRV_hp300=
INPUT_DRV_hp300= ${INPUT_DRV_DEFAULT}
INPUT_DRV_hppa= ${INPUT_DRV_DEFAULT}
@ -62,7 +62,8 @@ VIDEO_DRV_amd64= \
VIDEO_DRV_armish= \
xf86-video-wsfb xf86-video-wsudl
VIDEO_DRV_hp300=
VIDEO_DRV_hp300= \
xf86-video-wsfb
VIDEO_DRV_hppa= \
xf86-video-wsfb \

4
xserver/Makefile.bsd-wrapper
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.43 2012/06/20 19:56:34 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.44 2013/03/14 20:49:52 miod Exp $
.include <bsd.xconf.mk>
DIST= ${.CURDIR}
# Machines for which we don't build the Xorg Xserver
NO_XORG_MACHINES= alpha aviion hp300 hppa64 landisk \
NO_XORG_MACHINES= alpha aviion hppa64 landisk \
mvme68k mvme88k mvmeppc solbourne vax
NO_XF86UTIL_MACHINES= hp300 landisk sgi sparc vax