Subject: first cut on xfree86-4.6.0
To: None <tech-x11@netbsd.org>
From: Matthias Drochner <M.Drochner@fz-juelich.de>
List: tech-x11
Date: 11/13/2006 17:23:02
This is a multipart MIME message.
--==_Exmh_6967660019190
Content-Type: text/plain; charset=us-ascii
Since xorg needs a lot more work and I wanted to have an X server
for my hardware (i945) quickly, I've built xfree-4.6.0 within
the srx/x11 reachover framework. There are still some issues:
-I didn't bother to merge in local changes yet. Also I didn't
check for new things to pull in.
-Xnest doesn't link. It seems to need some xfree86 specific
libraries, but as I understand it, Xnest should be hardware
independant, so there might be a misconfiguration elsewhere.
Xfree86 works on my laptop, it just needs the "915resolution"
helper program to fill the whole panel.
Couls someone more familiar with the x11 build things have
a look at the patches and tell whether the changes are correct
so far?
best regards
Matthias
--==_Exmh_6967660019190
Content-Type: text/plain ; name="x.txt"; charset=us-ascii
Content-Description: x.txt
Content-Disposition: attachment; filename="x.txt"
Index: Xserver/dix/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/dix/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Xserver/dix/Makefile 6 Mar 2004 03:31:06 -0000 1.9
+++ Xserver/dix/Makefile 13 Nov 2006 15:56:48 -0000
@@ -20,6 +20,7 @@
-I${X11SRCDIR.xc}/programs/Xserver/Xext \
-I${X11SRCDIR.xc}/programs/Xserver/lbx
+CPPFLAGS+= ${X11FLAGS.EXTENSION}
CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/\" \
-DRGB_DB=\"${X11LIBDIR}/rgb\"
Index: Xserver/dix/xpstubs/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/dix/xpstubs/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Xserver/dix/xpstubs/Makefile 30 Sep 2003 06:41:29 -0000 1.4
+++ Xserver/dix/xpstubs/Makefile 13 Nov 2006 15:56:48 -0000
@@ -5,13 +5,14 @@
.include <bsd.own.mk>
LIB= xpstubs
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/dix
+.PATH: ${X11SRCDIR.xc}/lib/font/stubs
SRCS= xpstubs.c
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/lib/font/include \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${X11SRCDIR.xc}/programs/Xserver/Xext \
-I${X11SRCDIR.xc}/programs/Xserver/lbx
Index: Xserver/hw/dmx/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/dmx/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Xserver/hw/dmx/Makefile 9 May 2005 20:02:21 -0000 1.4
+++ Xserver/hw/dmx/Makefile 13 Nov 2006 15:56:48 -0000
@@ -35,6 +35,7 @@
-I${X11SRCDIR.xc}/programs/Xserver/fb \
-I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
-I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/record \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${X11SRCDIR.xc}/programs/Xserver/Xext \
-I${XSERVERINCDIR}
Index: Xserver/hw/vfb/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/vfb/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Xserver/hw/vfb/Makefile 7 Feb 2004 06:52:05 -0000 1.6
+++ Xserver/hw/vfb/Makefile 13 Nov 2006 15:56:48 -0000
@@ -8,7 +8,7 @@
.PATH: ${X11SRCDIR.xc}/programs/Xserver/Xi
.PATH: ${X11SRCDIR.xc}/programs/Xserver/mi
-SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c
+SRCS= InitInput.c InitOutput.c miinitext.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/include/fonts \
@@ -16,6 +16,8 @@
-I${X11SRCDIR.xc}/programs/Xserver/mfb \
-I${X11SRCDIR.xc}/programs/Xserver/mi \
-I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/programs/Xserver/record \
+ -I${X11SRCDIR.xc}/programs/Xserver/dbe \
-I${XSERVERINCDIR} \
-I${X11SRCDIR.xc}/programs/Xserver/os \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
Index: Xserver/hw/xfree86/bin/xf86cfg/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Xserver/hw/xfree86/bin/xf86cfg/Makefile 31 Mar 2006 21:43:42 -0000 1.6
+++ Xserver/hw/xfree86/bin/xf86cfg/Makefile 13 Nov 2006 15:56:48 -0000
@@ -26,6 +26,7 @@
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/parser \
-I${X11SRCDIR.xc}/programs/Xserver/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/lib/font/include \
Index: Xserver/hw/xfree86/drivers/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Xserver/hw/xfree86/drivers/Makefile 16 Apr 2006 15:47:35 -0000 1.15
+++ Xserver/hw/xfree86/drivers/Makefile 13 Nov 2006 15:56:48 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.15 2006/04/16 15:47:35 macallan Exp $
SUBDIR= ati atimisc chips fbdev glint imstt mga nv r128 radeon \
- s3 s3virge savage sis tdfx trident wsfb
+ s3 s3virge savage sis tdfx trident
.if ${MACHINE} != "sparc64" && ${MACHINE} != "sparc"
SUBDIR+= vga
Index: Xserver/hw/xfree86/drivers/i810/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/i810/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Xserver/hw/xfree86/drivers/i810/Makefile 22 Mar 2005 15:00:37 -0000 1.4
+++ Xserver/hw/xfree86/drivers/i810/Makefile 13 Nov 2006 15:56:48 -0000
@@ -11,7 +11,8 @@
SRCS= i810_accel.c i810_cursor.c i810_dga.c i810_driver.c \
i810_io.c i810_memory.c i810_video.c i810_wmark.c \
i830_accel.c i830_cursor.c i830_dga.c i830_driver.c \
- i830_io.c i830_memory.c i830_modes.c i830_video.c
+ i830_io.c i830_memory.c i830_modes.c i830_video.c \
+ i830_shadow.c
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i810 \
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
@@ -28,6 +29,7 @@
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
-I${X11SRCDIR.xc}/programs/Xserver/Xext \
-I${X11SRCDIR.xc}/include/fonts \
-I${X11SRCDIR.xc}/programs/Xserver/include \
Index: Xserver/hw/xfree86/input/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Xserver/hw/xfree86/input/Makefile 12 Nov 2005 22:57:46 -0000 1.5
+++ Xserver/hw/xfree86/input/Makefile 13 Nov 2006 15:56:48 -0000
@@ -2,7 +2,7 @@
SUBDIR= acecad mouse calcomp citron digitaledge dmc dynapro elographics fpit \
hyperpen js_x kbd magellan microtouch mutouch palmax penmount \
- spaceorb summa tek4957 usbtablet void wacom
+ spaceorb summa tek4957 void wacom
.if ${MACHINE} == "sgimips"
SUBDIR= mouse kbd void
Index: Xserver/hw/xnest/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xnest/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Xserver/hw/xnest/Makefile 6 Mar 2004 03:31:08 -0000 1.6
+++ Xserver/hw/xnest/Makefile 13 Nov 2006 15:56:48 -0000
@@ -10,7 +10,7 @@
SRCS= Args.c Color.c Cursor.c Display.c Events.c Font.c \
GC.c GCOps.c GetTime.c Handlers.c Init.c Keyboard.c \
Pixmap.c Pointer.c Screen.c TestExt.c Visual.c \
- Window.c miinitext.c stubs.c
+ Window.c miinitext.c
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xnest \
-I${DESTDIR}${X11INCDIR}/X11 \
@@ -18,6 +18,8 @@
-I${X11SRCDIR.xc}/programs/Xserver/mi \
-I${X11SRCDIR.xc}/programs/Xserver/Xext \
-I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/programs/Xserver/record \
+ -I${X11SRCDIR.xc}/programs/Xserver/dbe \
-I${XSERVERINCDIR} \
-I${X11SRCDIR.xc}/programs/Xserver/os \
-I${DESTDIR}${X11INCDIR}/X11/extensions
Index: Xserver/mi/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/mi/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Xserver/mi/Makefile 25 Jan 2004 05:22:27 -0000 1.8
+++ Xserver/mi/Makefile 13 Nov 2006 15:56:48 -0000
@@ -20,6 +20,8 @@
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \
-I${X11SRCDIR.xc}/include/fonts \
-I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/record \
+ -I${X11SRCDIR.xc}/programs/Xserver/dbe \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${X11SRCDIR.xc}/programs/Xserver/Xext
Index: Xserver/os/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/os/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Xserver/os/Makefile 19 Mar 2005 21:41:58 -0000 1.14
+++ Xserver/os/Makefile 13 Nov 2006 15:56:48 -0000
@@ -7,7 +7,7 @@
.PATH: ${X11SRCDIR.xc}/lib/xtrans
SRCS= WaitFor.c access.c connection.c io.c oscolor.c osinit.c \
utils.c log.c auth.c mitauth.c secauth.c xdmauth.c xdmcp.c \
- xdmcp.c transport.c lbxio.c GetTimeInMillis.c
+ xdmcp.c transport.c lbxio.c
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \
-I${XSERVERINCDIR} \
@@ -51,9 +51,9 @@
CPPFLAGS.xdmauth.c= ${XDMCP_DEFINES}
COPTS.xdmauth.c= -Wno-error # XXX
CPPFLAGS.xdmcp.c= ${XDMCP_DEFINES} -DBSD44SOCKETS
-.if (${USE_PAM} != "no")
-CPPFLAGS.utils.c= ${XDMCP_DEFINES} -DUSE_PAM
-.endif
+#.if (${USE_PAM} != "no")
+#CPPFLAGS.utils.c= ${XDMCP_DEFINES} -DUSE_PAM
+#.endif
BUILDOBJS= libc_wrapper.o
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared
Index: Xserver/printer/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/printer/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Xserver/printer/Makefile 16 May 2004 10:25:14 -0000 1.6
+++ Xserver/printer/Makefile 13 Nov 2006 15:56:48 -0000
@@ -21,6 +21,8 @@
-I${X11SRCDIR.xc}/programs/Xserver/mi \
-I${X11SRCDIR.xc}/programs/Xserver/cfb \
-I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/programs/Xserver/record \
+ -I${X11SRCDIR.xc}/programs/Xserver/dbe \
-I${X11SRCDIR.xc}/include \
-I${X11SRCDIR.xc}/include/fonts \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
@@ -31,7 +33,7 @@
-UXFree86LOADER -D_XP_PRINT_SERVER_
-BUILDOBJS= ddxInit.o dpmsstubs.o miinitext.o
+BUILDOBJS= ddxInit.o miinitext.o
BUILDCPPFLAGS= -DPRINT_ONLY_SERVER \
${X11FLAGS.OS_DEFINES} \
${X11FLAGS.EXTENSION}
Index: Xserver/xinput/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/xinput/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Xserver/xinput/Makefile 29 Dec 2005 15:52:21 -0000 1.11
+++ Xserver/xinput/Makefile 13 Nov 2006 15:56:48 -0000
@@ -13,7 +13,7 @@
getselev.c getvers.c grabdev.c grabdevb.c grabdevk.c \
gtmotion.c listdev.c opendev.c queryst.c selectev.c \
sendexev.c setbmap.c setdval.c setfocus.c setmmap.c \
- setmode.c stubs.c ungrdev.c ungrdevb.c ungrdevk.c
+ setmode.c ungrdev.c ungrdevb.c ungrdevk.c
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
Index: bin/Makefile
===================================================================
RCS file: /cvsroot/src/x11/bin/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- bin/Makefile 13 May 2004 21:10:36 -0000 1.7
+++ bin/Makefile 13 Nov 2006 15:56:48 -0000
@@ -7,7 +7,7 @@
luit makedepend makeg makepsres makestrs mergelib \
mkcfm mkdirhier mkfontdir mkfontscale mkhtmlindex \
oclock proxymngr pswrap revpath rgb rman rstart \
- scripts setxkbmap showfont smproxy ssh-askpass sxpm \
+ scripts setxkbmap showfont smproxy sxpm \
texteroids twm ucs2any viewres \
x11perf xauth xbiff xcalc xclipboard xclock xcmsdb \
xconsole xcutsel xditview xdm xdpyinfo xedit xev xeyes \
@@ -15,7 +15,7 @@
xgamma xgc xhost xinit xkbcomp xkbevd xkbprint xkbutils \
xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman \
xmessage xmh xmkmf xmodmap xprop xrandr xrdb xrefresh xset \
- xsetmode xsetpointer xsetroot xsm xstdcmap xsystrace xterm \
+ xsetmode xsetpointer xsetroot xsm xstdcmap xterm \
xtrap xvidtune xvinfo xwd xwininfo xwud
.include <bsd.subdir.mk>
Index: bin/xdm/config/Makefile
===================================================================
RCS file: /cvsroot/src/x11/bin/xdm/config/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- bin/xdm/config/Makefile 29 Nov 2004 16:49:18 -0000 1.11
+++ bin/xdm/config/Makefile 13 Nov 2006 15:56:48 -0000
@@ -25,7 +25,7 @@
CONFIGFILES= GiveConsole TakeConsole \
Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
${CPPSCRIPTS}
-FILES= NetBSD.xpm NetBSDbw.xpm NetBSDinv.xpm \
+FILES= \
XFree86.xpm XFree86bw.xpm
FILESDIR= ${XDMDIR}
FILESDIR_NetBSD.xpm= ${X11INCDIR}/X11/pixmaps
Index: bin/xkbcomp/geometry/Makefile
===================================================================
RCS file: /cvsroot/src/x11/bin/xkbcomp/geometry/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- bin/xkbcomp/geometry/Makefile 28 Apr 2004 14:17:56 -0000 1.4
+++ bin/xkbcomp/geometry/Makefile 13 Nov 2006 15:56:48 -0000
@@ -5,7 +5,7 @@
XKBNAME= geometry
FILES= README amiga ataritt chicony dell everex fujitsu hp \
keytronic kinesis macintosh microsoft nec northgate \
- pc sharp sony sun winbook
+ pc sony sun winbook
SUBDIR= digital ibm sgi
Index: bin/xkbcomp/keycodes/Makefile
===================================================================
RCS file: /cvsroot/src/x11/bin/xkbcomp/keycodes/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- bin/xkbcomp/keycodes/Makefile 14 Jan 2004 12:49:09 -0000 1.3
+++ bin/xkbcomp/keycodes/Makefile 13 Nov 2006 15:56:49 -0000
@@ -3,7 +3,7 @@
.include <bsd.own.mk>
XKBNAME= keycodes
-FILES= README amiga ataritt fujitsu hp ibm macintosh sony sun x68k \
+FILES= README amiga ataritt fujitsu hp ibm macintosh sony sun \
xfree86 xfree98 powerpcps2 aliases
SUBDIR= digital sgi
Index: bin/xkbcomp/keymap/Makefile
===================================================================
RCS file: /cvsroot/src/x11/bin/xkbcomp/keymap/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- bin/xkbcomp/keymap/Makefile 14 Jan 2004 12:49:09 -0000 1.3
+++ bin/xkbcomp/keymap/Makefile 13 Nov 2006 15:56:49 -0000
@@ -3,7 +3,7 @@
.include <bsd.own.mk>
XKBNAME= keymap
-FILES= README amiga ataritt macintosh sony x68k xfree86 xfree98
+FILES= README amiga ataritt macintosh sony xfree86 xfree98
SUBDIR= digital sgi sun
Index: bin/xkbcomp/symbols/Makefile
===================================================================
RCS file: /cvsroot/src/x11/bin/xkbcomp/symbols/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- bin/xkbcomp/symbols/Makefile 23 Mar 2005 01:00:33 -0000 1.5
+++ bin/xkbcomp/symbols/Makefile 13 Nov 2006 15:56:49 -0000
@@ -31,7 +31,7 @@
yu \
apple
-SUBDIR= digital fujitsu hp macintosh nec sgi sharp sony sun xfree68 pc
+SUBDIR= digital fujitsu hp macintosh nec sgi sony sun xfree68 pc
XKBDIR= 1
Index: include/extensions/Makefile
===================================================================
RCS file: /cvsroot/src/x11/include/extensions/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- include/extensions/Makefile 20 Mar 2005 23:58:11 -0000 1.6
+++ include/extensions/Makefile 13 Nov 2006 15:56:49 -0000
@@ -21,8 +21,8 @@
shapestr.h shmstr.h sync.h syncstr.h xcmiscstr.h xf86bigfont.h \
xf86bigfstr.h xf86dga.h xf86dga1.h xf86dga1str.h xf86dgastr.h \
xf86misc.h xf86mscstr.h xf86rush.h xf86rushstr.h xf86vmode.h \
- xf86vmstr.h xtestext1.h xteststr.h xtrapbits.h xtrapddmi.h xtrapdi.h \
- xtrapemacros.h xtraplib.h xtraplibp.h xtrapproto.h
+ xf86vmstr.h xtestext1.h xteststr.h xtrapbits.h xtrapdi.h \
+ xtrapemacros.h xtraplib.h xtraplibp.h
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: include/fonts/Makefile
===================================================================
RCS file: /cvsroot/src/x11/include/fonts/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- include/fonts/Makefile 14 Sep 2003 07:11:09 -0000 1.3
+++ include/fonts/Makefile 13 Nov 2006 15:56:49 -0000
@@ -6,7 +6,7 @@
INCSDIR=${X11INCDIR}/X11/fonts
-INCS= FS.h FSproto.h fsmasks.h
+INCS= FS.h FSproto.h fsmasks.h fontstruct.h font.h fontproto.h
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: lib/Xpm/Makefile
===================================================================
RCS file: /cvsroot/src/x11/lib/Xpm/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- lib/Xpm/Makefile 24 Sep 2005 13:51:47 -0000 1.7
+++ lib/Xpm/Makefile 13 Nov 2006 15:56:49 -0000
@@ -9,7 +9,7 @@
CrIFrBuf.c CrIFrDat.c CrIFrP.c CrPFrBuf.c CrPFrDat.c CrPFrI.c \
Image.c Info.c RdFToBuf.c RdFToDat.c RdFToI.c RdFToP.c \
WrFFrBuf.c WrFFrDat.c WrFFrI.c WrFFrP.c create.c data.c \
- hashtab.c misc.c parse.c rgb.c scan.c
+ hashtab.c misc.c parse.c rgb.c scan.c s_popen.c
INCS= xpm.h
INCSDIR=${X11INCDIR}/X11
--==_Exmh_6967660019190--