Module Name: src
Committed By: mrg
Date: Thu Jun 11 05:43:19 UTC 2009
Modified Files:
src/external/mit/xorg: TODO
src/external/mit/xorg/server/xorg-server: Makefile Makefile.Xserver
src/external/mit/xorg/server/xorg-server/GL/GLcore: Makefile.GLcore
src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xextbuiltin
Makefile.Xextmodule
src/external/mit/xorg/server/xorg-server/Xi: Makefile
src/external/mit/xorg/server/xorg-server/composite: Makefile
src/external/mit/xorg/server/xorg-server/dbe: Makefile.dbe
src/external/mit/xorg/server/xorg-server/dix: Makefile
src/external/mit/xorg/server/xorg-server/doc: Makefile
src/external/mit/xorg/server/xorg-server/exa: Makefile.exa
src/external/mit/xorg/server/xorg-server/fb: Makefile.fb
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
Makefile.dixmod
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/doc: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
src/external/mit/xorg/server/xorg-server/include: Makefile
src/external/mit/xorg/server/xorg-server/os: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile
src/external/mit/xorg/server/xorg-server/render: Makefile
src/external/mit/xorg/server/xorg-server/xkb: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/glx: Makefile Makefile.glx
Log Message:
upgrade the build framework for xorg-server 1.6.
this doesn't quite work yet. Xvfb and Xnest attempt to link but
have missing symbols. Xorg doesn't build all its components yet.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/TODO
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/server/xorg-server/Xi/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/composite/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/doc/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/exa/Makefile.exa
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/server/xorg-server/glx/Makefile \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/include/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/randr/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/render/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/xkb/Makefile
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/TODO
diff -u src/external/mit/xorg/TODO:1.16 src/external/mit/xorg/TODO:1.17
--- src/external/mit/xorg/TODO:1.16 Sun Oct 5 18:39:28 2008
+++ src/external/mit/xorg/TODO Thu Jun 11 05:43:15 2009
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.16 2008/10/05 18:39:28 cube Exp $
+$NetBSD: TODO,v 1.17 2009/06/11 05:43:15 mrg Exp $
plan:
- build modular-xorg stuff with reach over
@@ -45,3 +45,7 @@
things to delete:
- lbx is dead, kill it
+
+upgrade issues:
+ - xorg-server 1.6 needs libpciaccess, newer Xfont, newer Mesa and xkeyboard-config
+ - new Mesa has glslcompiler -- do we want it?
Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.18 src/external/mit/xorg/server/xorg-server/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/Makefile:1.18 Mon Dec 22 01:04:27 2008
+++ src/external/mit/xorg/server/xorg-server/Makefile Thu Jun 11 05:43:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/12/22 01:04:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.19 2009/06/11 05:43:15 mrg Exp $
.include <bsd.own.mk>
@@ -16,24 +16,6 @@
SUBDIR.miext=
.endif
-.if ${XSERVER_HAS_CFB} != "no"
-SUBDIR.cfb=cfb cfb32
-.else
-SUBDIR.cfb=
-.endif
-
-.if ${XSERVER_HAS_FB} != "no"
-SUBDIR.fb=fb
-.else
-SUBDIR.fb=
-.endif
-
-.if ${XSERVER_HAS_AFB} != "no"
-SUBDIR.afb=afb
-.else
-SUBDIR.afb=
-.endif
-
.if ${XSERVER_HAS_IPLAN} != "no"
SUBDIR.iplan=iplan2p4 iplan2p8
.else
@@ -41,21 +23,12 @@
.endif
SUBDIR= doc include .WAIT
-SUBDIR+= GL
-SUBDIR+= dix ${SUBDIR.fb} mi Xext ${SUBDIR.miext} os randr render
-SUBDIR+= Xi xkb xkbstubs dbe mfb ${SUBDIR.afb} ${SUBDIR.cfb} record xfixes
-SUBDIR+= damageext XTrap composite config .WAIT
+SUBDIR+= glx
+SUBDIR+= dix fb mi Xext ${SUBDIR.miext} os randr render
+SUBDIR+= Xi xkb xkbstubs dbe record xfixes
+SUBDIR+= damageext composite config .WAIT
SUBDIR+= hw
-# XXX stuff installed by modular-xorg-server we need to deal with:
-#libpcidata
-#libshadow
-
-#bin/X
-#bin/Xorg
-#bin/xorgcfg
-#bin/xorgconfig
-
.PATH: ${X11SRCDIR.xorg-server}
PKGCONFIG= xorg-server
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.8 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.9
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.8 Mon Dec 22 01:04:27 2008
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Thu Jun 11 05:43:15 2009
@@ -1,22 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.8 2008/12/22 01:04:27 jmcneill Exp $
-
-# XXX old list
-.if 0
-.for _SL in dix os mi composite damage miext/damage \
- Xext/ext Xext/exts GL/glx GL/GLcore xkb dbe \
- record randr render xtrap mfb iplan2p4 iplan2p8 \
- cfb cfb16 cfb24 cfb32 fb xfixes miext/cw \
- hw/xnest hw/vfb fontbase afb \
- \
- dix/xpstubs hw/sun hw/xfree86/xf86 hw/xfree86/xf86_os \
- hw/xfree86/xf86config hw/xfree86/loader \
- \
- hw/netbsd/macppc hw/netbsd/hpc hw/netbsd/x68k \
- hw/netbsd/mac68k hw/netbsd/amiga hw/netbsd/dec \
- hw/netbsd/arm32vidc hw/netbsd/alpha hw/netbsd/dreamcast \
- hw/netbsd/newsmips
-.endfor
-.endif
+# $NetBSD: Makefile.Xserver,v 1.9 2009/06/11 05:43:15 mrg Exp $
.for _SL in \
mi \
@@ -95,8 +77,6 @@
LDADD.XORG_CORE= ${LDADD.dix} ${LDADD.config}
DPADD.XORG_CORE= ${DPADD.dix} ${DPADD.config}
-LIBCWRAPPER= ${LIBDIR.os}/libc_wrapper.o
-
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/Xext \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
Index: src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore
diff -u src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore:1.1 src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore:1.2
--- src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore:1.1 Fri Sep 26 06:57:03 2008
+++ src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore Thu Jun 11 05:43:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.GLcore,v 1.1 2008/09/26 06:57:03 rtr Exp $
+# $NetBSD: Makefile.GLcore,v 1.2 2009/06/11 05:43:15 mrg Exp $
SRCS.GLcore= \
${SRCS.main} \
@@ -179,7 +179,6 @@
slang_emit.c \
slang_ir.c \
slang_label.c \
- slang_library_noise.c \
slang_link.c \
slang_log.c \
slang_mem.c \
Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.4 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.5
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.4 Sat Aug 9 06:48:17 2008
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin Thu Jun 11 05:43:15 2009
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile.Xextbuiltin,v 1.4 2008/08/09 06:48:17 rtr Exp $
+# $NetBSD: Makefile.Xextbuiltin,v 1.5 2009/06/11 05:43:15 mrg Exp $
SRCS.Xextbuiltin= shape.c sleepuntil.c xtest.c
SRCS.Xextbuiltin+= shm.c
SRCS.Xextbuiltin+= panoramiX.c panoramiXprocs.c panoramiXSwap.c
SRCS.Xextbuiltin+= xace.c
SRCS.Xextbuiltin+= security.c
-#SRCS.Xextbuiltin+= xcalibrate.c
-SRCS.Xextbuiltin+= xevie.c
-#SRCS.Xextbuiltin+= xprint.c
-SRCS.Xextbuiltin+= appgroup.c
SRCS.Xextbuiltin+= xf86bigfont.c
Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule:1.5 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule:1.6
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule:1.5 Wed Jun 10 08:29:20 2009
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule Thu Jun 11 05:43:15 2009
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile.Xextmodule,v 1.5 2009/06/10 08:29:20 mrg Exp $
+# $NetBSD: Makefile.Xextmodule,v 1.6 2009/06/11 05:43:15 mrg Exp $
-SRCS.Xextmodule= bigreq.c mitmisc.c sync.c xcmisc.c
+SRCS.Xextmodule= bigreq.c sync.c xcmisc.c
SRCS.Xextmodule+= xvmain.c xvdisp.c xvmc.c
SRCS.Xextmodule+= xres.c
SRCS.Xextmodule+= saver.c
-SRCS.Xextmodule+= cup.c
-SRCS.Xextmodule+= EVI.c sampleEVI.c
SRCS.Xextmodule+= mbuf.c
SRCS.Xextmodule+= dpms.c
Index: src/external/mit/xorg/server/xorg-server/Xi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.1 src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.1 Sat Aug 2 19:42:15 2008
+++ src/external/mit/xorg/server/xorg-server/Xi/Makefile Thu Jun 11 05:43:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/02 19:42:15 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/11 05:43:15 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -14,7 +14,7 @@
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 ungrdev.c ungrdevb.c \
- ungrdevk.c
+ ungrdevk.c xiproperty.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
Index: src/external/mit/xorg/server/xorg-server/composite/Makefile
diff -u src/external/mit/xorg/server/xorg-server/composite/Makefile:1.2 src/external/mit/xorg/server/xorg-server/composite/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/composite/Makefile:1.2 Thu Aug 28 07:33:38 2008
+++ src/external/mit/xorg/server/xorg-server/composite/Makefile Thu Jun 11 05:43:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/28 07:33:38 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:15 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -6,7 +6,8 @@
LIB= composite
.PATH: ${X11SRCDIR.xorg-server}/composite
-SRCS= compalloc.c compext.c compint.h compinit.c compwindow.c
+SRCS= compalloc.c compext.c compint.h compinit.c compwindow.c \
+ compoverlay.c
CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION} ${X11FLAGS.DIX} ${X11INCS.DIX}
Index: src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe
diff -u src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.4 src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.5
--- src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.4 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe Thu Jun 11 05:43:15 2009
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.dbe,v 1.4 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile.dbe,v 1.5 2009/06/11 05:43:15 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/dbe
SRCS.dbe= dbe.c midbe.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${DESTDIR}${X11INCDIR}/pixman-1
.include <bsd.x11.mk>
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.6 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.6 Mon Oct 20 16:25:06 2008
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Thu Jun 11 05:43:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/10/20 16:25:06 cube Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/11 05:43:15 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -12,7 +12,9 @@
dixutils.c events.c extension.c ffs.c gc.c getevents.c \
globals.c glyphcurs.c grabs.c initatoms.c main.c pixmap.c \
privates.c property.c resource.c swaprep.c swapreq.c \
- tables.c window.c
+ tables.c window.c \
+ deprecated.c enterleave.c ptrveloc.c registry.c selection.c
+
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
@@ -31,6 +33,3 @@
.include <bsd.x11.mk>
.include <bsd.lib.mk>
-
-SUBDIR= xpstubs
-.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/xorg-server/doc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/doc/Makefile:1.2 src/external/mit/xorg/server/xorg-server/doc/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/doc/Makefile:1.2 Tue Oct 14 23:37:19 2008
+++ src/external/mit/xorg/server/xorg-server/doc/Makefile Thu Jun 11 05:43:16 2009
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:16 mrg Exp $
.include <bsd.own.mk>
.include "../dix/Makefile.common"
.PATH: ${X11SRCDIR.xorg-server}/doc
-MAN= SecurityPolicy.5 Xserver.1
+MAN= Xserver.1
X11EXTRAMANDEFS+= -e 's%__default_font_path__%${X11DEFAULTFONTPATH:ts,:S/,/, /g}%g'
.include <bsd.x11.mk>
Index: src/external/mit/xorg/server/xorg-server/exa/Makefile.exa
diff -u src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.2 src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.3
--- src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.2 Mon Sep 1 15:12:22 2008
+++ src/external/mit/xorg/server/xorg-server/exa/Makefile.exa Thu Jun 11 05:43:16 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.exa,v 1.2 2008/09/01 15:12:22 christos Exp $
+# $NetBSD: Makefile.exa,v 1.3 2009/06/11 05:43:16 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/exa
SRCS.exa= exa.c exa_accel.c exa_migration.c exa_offscreen.c \
- exa_render.c exa_unaccel.c
+ exa_render.c exa_unaccel.c exa_glyphs.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/Xext \
Index: src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.4 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.5
--- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.4 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Thu Jun 11 05:43:16 2009
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.fb,v 1.4 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile.fb,v 1.5 2009/06/11 05:43:16 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/fb
SRCS.fb= fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c \
- fbbltone.c fbbstore.c fbcopy.c \
+ fbbltone.c fbcopy.c \
fbfill.c fbfillrect.c fbfillsp.c fbgc.c fbgetsp.c \
fbglyph.c fbimage.c fbline.c fboverlay.c \
fbpict.c fbpixmap.c fbpoint.c fbpush.c fbscreen.c \
fbseg.c fbsetsp.c fbsolid.c fbstipple.c fbtile.c \
- fbtrap.c fbutil.c fbwindow.c fbpseudocolor.c
+ fbtrap.c fbutil.c fbwindow.c
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} -DHAVE_DIX_CONFIG_H
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.6 Sat Jan 24 17:24:52 2009
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Thu Jun 11 05:43:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/01/24 17:24:52 bouyer Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/11 05:43:16 mrg Exp $
.include <bsd.own.mk>
@@ -59,10 +59,9 @@
${LDADD.Xext} \
${LDADD.config} \
${LDADD.dbe} \
- ${LDADD.XTrap} \
${LDADD.record} \
- ${LDADD.render} \
${LDADD.randr} \
+ ${LDADD.render} \
${LDADD.damageext} \
${LDADD.miext/damage} \
${LDADD.miext/shadow} \
@@ -70,7 +69,6 @@
${LDADD.xkb} \
${LDADD.xkbstubs} \
${LDADD.composite} \
- ${LDADD.dix/xpstubs} \
${LDADD.os} \
-lXfont \
-lfreetype \
@@ -80,16 +78,18 @@
-lpixman-1 \
-lXdmcp \
-lz \
- -lm
+ -lm \
+ -lcrypto
DPADD+= ${DPADD.dix} ${DPADD.fb} ${DPADD.mi} ${DPADD.xfixes} \
- ${DPADD.Xext} ${DPADD.config} ${DPADD.dbe} ${DPADD.XTrap} \
+ ${DPADD.Xext} ${DPADD.config} ${DPADD.dbe} \
${DPADD.record} ${DPADD.render} ${DPADD.randr} ${DPADD.damageext} \
${DPADD.miext/damage} ${DPADD.miext/shadow} ${DPADD.Xi} \
- ${DPADD.xkb} ${DPADD.composite} ${DPADD.dix/xpstubs} ${DPADD.os} \
+ ${DPADD.xkb} ${DPADD.composite} ${DPADD.os} \
${LIBCWRAPPER} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
- ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM}
+ ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} \
+ ${LIBCRYPTO}
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.25 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.26
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.25 Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Thu Jun 11 05:43:16 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2009/02/14 13:32:13 abs Exp $
+# $NetBSD: Makefile,v 1.26 2009/06/11 05:43:16 mrg Exp $
-SUBDIR= common init ddc dixmods doc dri dummy i2c int10 loader \
+SUBDIR= common init ddc dixmods doc dri dri2 dummy i2c int10 loader \
xf86modes exa \
- xorgos rac ramdac scanpci pcidata shadowfb vbe vgahw \
- x86emu xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp xf86config
+ xorgos ramdac pcidata shadowfb vbe vgahw \
+ x86emu xaa xf86config xf8_16bpp
SUBDIR+= .WAIT utils
@@ -20,7 +20,6 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/include/fonts \
-I${X11SRCDIR.xorg-server}/fb \
- -I${X11SRCDIR.xorg-server}/mfb \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/os \
@@ -44,7 +43,6 @@
LDADD+= ${LDADD.hw/xfree86/common}
LDADD+= ${LDADD.hw/xfree86/xorgos}
#LDADD+= ${LDADD.osandcommon}
-LDADD+= ${LDADD.hw/xfree86/rac}
LDADD+= ${LDADD.hw/xfree86/xf86config}
LDADD+= ${LDADD.hw/xfree86/dixmods}
LDADD+= ${LDADD.hw/xfree86/xf86modes}
@@ -63,7 +61,6 @@
LDADD+= ${LDADD.miext/cw}
LDADD+= ${LDADD.Xi}
LDADD+= ${LDADD.xkb}
-LDADD+= ${LDADD.dix/xpstubs}
LDADD+= ${LDADD.os}
LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
@@ -103,11 +100,9 @@
${DPADD.composite} \
${DPADD.os} \
${DPADD.hw/xfree86/dixmods/fb} \
- ${DPADD.dix/xpstubs} \
${DPADD.hw/xfree86/fb} \
${DPADD.hw/xfree86/init} \
${DPADD.hw/xfree86/loader} \
- ${DPADD.hw/xfree86/rac} \
${DPADD.hw/xfree86/xf86config} \
${DPADD.hw/xfree86/dixmods} \
${DPADD.hw/xfree86/xf86modes} \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.8 Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Thu Jun 11 05:43:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/02/14 13:32:13 abs Exp $
+# $NetBSD: Makefile,v 1.9 2009/06/11 05:43:16 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@@ -9,24 +9,16 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/common
SRCS.xv= xf86xv.c xf86xvmc.c
-
-SRCS.bus= xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c
-
-SRCS.xkb= xf86XKB.c
-SRCS.xiso= xf86Xinput.c xisb.c
+SRCS.bus= xf86pciBus.c xf86fbBus.c xf86noBus.c
SRCS.randr= xf86RandR.c
-# no xf86cvt.c - it is libxf86modes
-SRCS= xf86Configure.c xf86Bus.c xf86Config.c \
+SRCS= xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c \
- xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
- xf86Globals.c xf86AutoConfig.c \
- xf86MiscExt.c xf86Option.c \
- xf86VidMode.c xf86fbman.c xf86cmap.c \
- xf86Helper.c xf86PM.c \
- xf86Mode.c xf86Build.h xorgHelper.c xf86Versions.c \
- xf86DefModeSet.c ${SRCS.xv} \
- ${SRCS.xiso} ${SRCS.randr} ${SRCS.bus} ${SRCS.xkb}
+ xf86Events.c xf86Globals.c xf86AutoConfig.c \
+ xf86Option.c \
+ xf86Helper.c xf86PM.c xf86RAC.c xf86Xinput.c xisb.c \
+ xf86Mode.c xorgHelper.c \
+ ${SRCS.xv} ${SRCS.bus} ${SRCS.randr}
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
SRCS.bus+= xf86sbusBus.c
@@ -67,13 +59,13 @@
-I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/modes \
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
-I${X11SRCDIR.xorg-server}/hw/xfree86 \
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
-I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
-I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
-I${X11SRCDIR.xorg-server}/hw/xfree86/rac \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/scanpci \
-I${X11SRCDIR.xorg-server}/hw/xfree86/vbe \
-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
-I${X11SRCDIR.xorg-server}/render \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.5 Mon Oct 6 10:33:44 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Thu Jun 11 05:43:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/10/06 10:33:44 rtr Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/11 05:43:16 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -23,21 +23,14 @@
SUBDIR = \
GLcore \
- afb \
- cfb \
- cfb32 \
dbe \
extmod \
fb \
- freetype \
glx \
- mfb \
record \
shadow \
- type1 \
wfb \
- xorgxkb \
- xtrap
+ xorgxkb
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod:1.4 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod Thu Jun 11 05:43:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.dixmod,v 1.4 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile.dixmod,v 1.5 2009/06/11 05:43:16 mrg Exp $
.include <bsd.own.mk>
@@ -10,10 +10,8 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/afb \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/mfb \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/cfb \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dbe \
+ -I${X11SRCDIR.xorg-server}/glx \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.5 Fri Aug 15 15:55:06 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile Thu Jun 11 05:43:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/08/15 15:55:06 rtr Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/11 05:43:16 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -8,7 +8,7 @@
LIB= extmod
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
-SRCS= xf86dga.c xf86dga2.c \
+SRCS= xf86dga2.c \
xvmod.c \
xf86misc.c \
xf86vmode.c \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile:1.2 Sun Aug 10 06:28:16 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile Thu Jun 11 05:43:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/10 06:28:16 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:16 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/fonts
@@ -7,6 +7,6 @@
LIB= freetype
-SRCS= ftmodule.c
+SRCS= # ftmodule.c
.include "../Makefile.dixmod"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.3 Tue Oct 14 23:37:19 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile Thu Jun 11 05:43:17 2009
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/doc
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/doc/man
-FILES= README.DRI README.fonts README.rapidaccess
+FILES= README.DRI README.rapidaccess
FILESDIR= ${X11USRLIBDIR}/X11/doc
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.4 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile Thu Jun 11 05:43:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/11 05:43:17 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -15,8 +15,13 @@
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
- -I${X11SRCDIR.xorg-server}/GL/glx \
+ -I${X11SRCDIR.xorg-server}/glx \
-I${X11SRCDIR.xorg-server}/GL/include \
+ -I${X11SRCDIR.xorg-server}/modes \
+ -I${X11SRCDIR.xorg-server}/ddc \
+ -I${X11SRCDIR.xorg-server}/i2c \
+ -I${X11SRCDIR.xorg-server}/parser \
+ -I${X11SRCDIR.xorg-server}/ramdac \
-I${X11SRCDIR.MesaLib}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile:1.2 Fri Aug 15 15:55:06 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile Thu Jun 11 05:43:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:17 mrg Exp $
MKX11LOADABLE=no
@@ -8,11 +8,11 @@
LIB= dummy
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dummylib
-SRCS= fatalerror.c getvalidbios.c getemptypci.c logvwrite.c \
- pcitestmulti.c verrorf.c xalloc.c \
+SRCS= dixprivates.c fatalerror.c logvwrite.c \
+ verrorf.c xalloc.c \
xf86allocscripi.c xf86addrestolist.c xf86drvmsg.c \
xf86drvmsgverb.c xf86errorf.c xf86errorfverb.c \
- xf86getpagesize.c xf86getverb.c xf86info.c xf86msg.c \
+ xf86getverb.c xf86info.c xf86msg.c \
xf86msgverb.c xf86opt.c xf86screens.c xf86servisinit.c \
xf86verbose.c
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Thu Jun 11 05:43:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -9,7 +9,7 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/int10
SRCS= x86emu.c generic.c xf86x86emu.c xf86int10.c helper_mem.c \
- helper_exec.c xf86int10module.c pci.c
+ helper_exec.c xf86int10module.c
CPPFLAGS+= -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \
-D_X86EMU -DNO_SYS_HEADERS
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Thu Jun 11 05:43:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -7,7 +7,7 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
SRCS= loader.c loadext.c loadmod.c loadfont.c dlloader.c os.c dixsym.c \
- extsym.c fontsym.c misym.c xf86sym.c
+ extsym.c misym.c xf86sym.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
SRCS+= SparcMulDiv.S
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.11 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.11 Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Thu Jun 11 05:43:17 2009
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.11 2009/02/14 13:32:13 abs Exp $
+# $NetBSD: Makefile,v 1.12 2009/06/11 05:43:17 mrg Exp $
-SUBDIR= cvt gtf xorgconfig
+SUBDIR= cvt gtf
+#SUBDIR= cvt gtf xorgconfig
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=ioport pcitweak scanpci
+#SUBDIR+=ioport pcitweak scanpci
.endif
.if ${MACHINE} == "cats" || ${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha"
-SUBDIR+=pcitweak scanpci
+#SUBDIR+=pcitweak scanpci
.endif
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.2 Tue Oct 14 23:37:19 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile Thu Jun 11 05:43:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:17 mrg Exp $
PROG= cvt
SRCS= cvt.c xf86cvt.c
@@ -9,7 +9,9 @@
CPPFLAGS+= ${X11FLAGS.DIX} -DHAVE_XORG_CONFIG_H \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${X11SRCDIR.xorg-server}/../include
+ -I${X11SRCDIR.xorg-server}/../include \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/parser
LDADD+= ${LIBDUMMY}
DPADD+= ${LIBDUMMY}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile Thu Jun 11 05:43:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -13,7 +13,7 @@
xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \
xaaCpyPlane.c xaaFillRect.c xaaTEText.c xaaNonTEText.c \
xaaPCache.c xaaSpans.c xaaROP.c xaaImage.c xaaWrapper.c \
- xaaPaintWin.c xaaRect.c xaaLineMisc.c xaaBitOrder.c \
+ xaaRect.c xaaLineMisc.c xaaBitOrder.c \
xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c \
xaaLine.c xaaDashLine.c xaaOverlay.c xaaOffscreen.c \
xaaOverlayDF.c xaaStateChange.c xaaPict.c
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.13 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.13 Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Thu Jun 11 05:43:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/02/14 13:32:13 abs Exp $
+# $NetBSD: Makefile,v 1.14 2009/06/11 05:43:17 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -9,9 +9,9 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bsd
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared
SRCS.bsd= \
- bsd_VTsw.c bsd_bell.c bsd_init.c bsd_mouse.c \
- kmod_noop.c libc_wrapper.c \
- posix_tty.c sigio.c stdPci.c vidmem.c
+ bsd_VTsw.c bsd_bell.c bsd_init.c \
+ kmod_noop.c \
+ posix_tty.c sigio.c vidmem.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/linux
.if ${MACHINE_ARCH} == "x86_64"
@@ -97,11 +97,10 @@
# XXX .S not built from automake either
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-#SRCS.misc+= BUSmemcpy.S IODelay.S SlowBcopy.S
-SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
-CPPFLAGS.BUSmemcpy.S= -DUSE_GAS
-CPPFLAGS.IODelay.S= -DUSE_GAS
-CPPFLAGS.SlowBcopy.S= -DUSE_GAS
+#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
+#CPPFLAGS.BUSmemcpy.S= -DUSE_GAS
+#CPPFLAGS.IODelay.S= -DUSE_GAS
+#CPPFLAGS.SlowBcopy.S= -DUSE_GAS
.endif
.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
@@ -109,14 +108,14 @@
${MACHINE_ARCH} == "sparc" || ${MACHINE} == "netwinder" || \
${MACHINE} == "shark" || ${MACHINE} == "ofppc" || \
${MACHINE_ARCH} == "alpha"
-SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
+#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
.endif
# XXX namespace collision so avoid it, only has to be done for non-i386.
-BUILDSYMLINKS= BUSmemcpy.c CBUSmemcpy.c \
- IODelay.c CIODelay.c \
- SlowBcopy.c CSlowBcopy.c
+#BUILDSYMLINKS= BUSmemcpy.c CBUSmemcpy.c \
+# IODelay.c CIODelay.c \
+# SlowBcopy.c CSlowBcopy.c
SRCS= ${SRCS.bsd} ${SRCS.bus} ${SRCS.misc} xorgos.c
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.8 Sat Jan 24 17:24:53 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Thu Jun 11 05:43:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/01/24 17:24:53 bouyer Exp $
+# $NetBSD: Makefile,v 1.9 2009/06/11 05:43:18 mrg Exp $
.include <bsd.own.mk>
@@ -52,10 +52,9 @@
${LDADD.xfixes} \
${LDADD.Xext} \
${LDADD.dbe} \
- ${LDADD.XTrap} \
${LDADD.record} \
- ${LDADD.render} \
${LDADD.randr} \
+ ${LDADD.render} \
${LDADD.damageext} \
${LDADD.miext/damage} \
${LDADD.cw/cw} \
@@ -64,11 +63,10 @@
${LDADD.xkb} \
${LDADD.xkbstubs} \
${LDADD.composite} \
- ${LDADD.dix/xpstubs} \
${LDADD.os} \
-lXfont -lXext -lfontenc \
-lpixman-1 -lX11 -lXau \
- -lXdmcp -lfreetype -lm
+ -lXdmcp -lfreetype -lm -lcrypto
DPADD+= ${LDADD.dix} \
${DPADD.fb} \
@@ -77,7 +75,6 @@
${DPADD.xfixes} \
${DPADD.Xext} \
${DPADD.dbe} \
- ${DPADD.XTrap} \
${DPADD.record} \
${DPADD.render} \
${DPADD.randr} \
@@ -88,11 +85,10 @@
${DPADD.Xi} \
${DPADD.xkb} \
${DPADD.composite} \
- ${DPADD.dix/xpstubs} \
${DPADD.os} \
${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
- ${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
+ ${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.4 src/external/mit/xorg/server/xorg-server/include/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.4 Sat Aug 2 21:18:49 2008
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Thu Jun 11 05:43:18 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2008/08/02 21:18:49 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/11 05:43:18 mrg Exp $
.include <bsd.own.mk>
XORGSRC= ${X11SRCDIR.xorg-server}
-XORGINC_SUBDIR= Xext afb cfb cfb dbe exa fb include mfb mi \
+XORGINC_SUBDIR= Xext dbe exa fb include mi \
miext/damage miext/shadow randr render xkb record
XF86_SUBDIR= common ddc dixmods/extmod dri fbdevhw i2c int10 modes \
os-support os-support/bus parser rac ramdac shadowfb \
@@ -21,15 +21,15 @@
.PATH: ${XORGSRC}/../include
INCSDIR=${X11INCDIR}/xorg
-INCS= BT.h IBM.h TI.h XIstubs.h afb.h assyntax.h atKeynames.h bstore.h \
- bstorestr.h bt829.h cfb.h cfb16.h cfb32.h cfb8_16.h cfb8_32.h \
- cfbmap.h cfbmskbits.h cfbunmap.h closestr.h closure.h colormap.h \
+INCS= BT.h IBM.h TI.h XIstubs.h bstore.h \
+ bstorestr.h bt829.h \
+ closestr.h closure.h colormap.h \
colormapst.h compiler.h cursor.h cursorstr.h damage.h damagestr.h \
dbestruct.h dgaproc.h dix.h dixevents.h dixfont.h dixfontstr.h \
dixgrabs.h dixstruct.h dri.h dristruct.h edid.h exa.h exevents.h \
extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \
- fbpseudocolor.h fbrop.h fi1236.h fourcc.h gc.h gcstruct.h globals.h \
- glyphstr.h i2c_def.h input.h inputstr.h mfb.h mfbmap.h mfbunmap.h \
+ fbrop.h fi1236.h fourcc.h gc.h gcstruct.h globals.h \
+ glyphstr.h i2c_def.h input.h inputstr.h \
mi.h mibank.h mibstore.h micmap.h micoord.h mifillarc.h mifpoly.h \
migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
mispans.h mistruct.h miwideline.h mizerarc.h msp3430.h opaque.h \
@@ -40,13 +40,15 @@
tda9885.h uda1380.h validate.h vbe.h vbeModes.h vgaHW.h \
window.h windowstr.h xaa.h xaaWrapper.h xaalocal.h xaarop.h \
xkbDflts.h xkb.h set.h \
- xf1bpp.h xf4bpp.h xf86.h xf86Crtc.h xf86Cursor.h xf86DDC.h \
- xf86Modes.h xf86Module.h xf86OSmouse.h \
+ xf86.h xf86Crtc.h xf86Cursor.h xf86DDC.h \
+ xf86Modes.h xf86Module.h \
xf86Opt.h xf86Optrec.h xf86Parser.h xf86Pci.h xf86PciInfo.h \
xf86Priv.h xf86Privstr.h xf86RAC.h xf86RamDac.h xf86RandR12.h \
- xf86Rename.h xf86Resources.h xf86Version.h xf86Xinput.h xf86_OSlib.h \
- xf86_OSproc.h xf86_ansic.h xf86_libc.h xf86cmap.h xf86fbman.h \
+ xf86Rename.h xf86Resources.h xf86Xinput.h xf86_OSlib.h \
+ xf86_OSproc.h xf86cmap.h xf86fbman.h \
xf86i2c.h xf86int10.h xf86sbusBus.h xf86str.h xf86xv.h \
+ xkbstr.h xkbrules.h xserver-properties.h \
+ dixaccess.h privates.h ptrveloc.h registry.h xkbfile.h \
xf86xvmc.h xf86xvpriv.h xisb.h xorg-server.h xorgVersion.h xvdix.h \
xvmcext.h hotplug.h xkbsrv.h dix-config.h
Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.4 src/external/mit/xorg/server/xorg-server/os/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.4 Fri Aug 15 15:55:06 2008
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Thu Jun 11 05:43:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/15 15:55:06 rtr Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/11 05:43:19 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -7,9 +7,9 @@
.PATH: ${X11SRCDIR.xorg-server}/os
SRCS= WaitFor.c access.c auth.c connection.c io.c mitauth.c \
- oscolor.c oscolor.h osdep.h osinit.c utils.c xdmauth.c \
+ oscolor.c osinit.c utils.c xdmauth.c \
xstrans.c xprintf.c log.c xdmcp.c \
- rpcauth.c secauth.c
+ rpcauth.c backtrace.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
@@ -60,12 +60,5 @@
COPTS.xdmauth.c= -Wno-error # XXX
COPTS.xstrans.c= -Wno-error # XXX
-BUILDOBJS= libc_wrapper.o
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared
-CPPFLAGS.libc_wrapper.c=-DSELF_CONTAINED_WRAPPER \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support
-CLEANFILES+= ${BUILDOBJS}
-realall: ${BUILDOBJS}
-
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/randr/Makefile
diff -u src/external/mit/xorg/server/xorg-server/randr/Makefile:1.2 src/external/mit/xorg/server/xorg-server/randr/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/randr/Makefile:1.2 Sun Aug 3 22:07:39 2008
+++ src/external/mit/xorg/server/xorg-server/randr/Makefile Thu Jun 11 05:43:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/03 22:07:39 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:19 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -8,11 +8,12 @@
.PATH: ${X11SRCDIR.xorg-server}/randr
SRCS= mirandr.c randr.c randrstr.h rrcrtc.c rrdispatch.c \
rrinfo.c rrmode.c rroutput.c rrpointer.c rrproperty.c \
- rrscreen.c rrsdispatch.c
+ rrscreen.c rrsdispatch.c rrtransform.c
SRCS+= rrxinerama.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/render/Makefile
diff -u src/external/mit/xorg/server/xorg-server/render/Makefile:1.1 src/external/mit/xorg/server/xorg-server/render/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/render/Makefile:1.1 Sat Aug 2 04:32:00 2008
+++ src/external/mit/xorg/server/xorg-server/render/Makefile Thu Jun 11 05:43:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/02 04:32:00 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/11 05:43:19 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -6,7 +6,7 @@
LIB= render
.PATH: ${X11SRCDIR.xorg-server}/render
-SRCS= animcur.c filter.c glyph.c miglyph.c miindex.c mipict.c \
+SRCS= animcur.c filter.c glyph.c matrix.c miindex.c mipict.c \
mirect.c mitrap.c mitri.c picture.c render.c renderedge.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
Index: src/external/mit/xorg/server/xorg-server/xkb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.4 src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.4 Mon Dec 22 01:04:27 2008
+++ src/external/mit/xorg/server/xorg-server/xkb/Makefile Thu Jun 11 05:43:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/12/22 01:04:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/11 05:43:19 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -8,12 +8,12 @@
.PATH: ${X11SRCDIR.xorg-server}/${LIB}
.PATH: ${X11SRCDIR.X11}/src
.PATH: ${X11SRCDIR.xkbfile}/src
-DDXSRCS= ddxBeep.c ddxCtrls.c ddxFakeBtn.c ddxFakeMtn.c \
+DDXSRCS= ddxBeep.c ddxCtrls.c ddxFakeMtn.c \
ddxInit.c ddxKeyClick.c ddxLEDs.c ddxLoad.c \
ddxList.c ddxDevBtn.c
DIXSRCS= xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbSwap.c \
xkbLEDs.c xkbInit.c xkbActions.c xkbPrKeyEv.c
-XKBFILESRCS= maprules.c xkmread.c xkbtext.c xkbfmisc.c xkberrs.c \
+XKBFILESRCS= maprules.c xkmread.c xkbtext.c xkbfmisc.c \
xkbout.c
X11SRCS= XKBMisc.c XKBAlloc.c XKBGAlloc.c XKBMAlloc.c
Added files:
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/glx/Makefile:1.1
--- /dev/null Thu Jun 11 05:43:20 2009
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile Thu Jun 11 05:43:16 2009
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2009/06/11 05:43:16 mrg Exp $
+
+LIBISPRIVATE=yes
+
+.include "../Makefile.serverlib"
+
+LIB= glx
+SRCS= ${SRCS.glx}
+
+.include "Makefile.glx"
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u /dev/null src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.1
--- /dev/null Thu Jun 11 05:43:20 2009
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Thu Jun 11 05:43:16 2009
@@ -0,0 +1,63 @@
+# $NetBSD: Makefile.glx,v 1.1 2009/06/11 05:43:16 mrg Exp $
+
+.PATH: ${X11SRCDIR.xorg-server}/glx
+.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
+.PATH: ${X11SRCDIR.MesaLib}/src/glx/x11
+
+SRCS.glx= \
+ indirect_dispatch.c \
+ indirect_dispatch_swap.c \
+ indirect_reqsize.c \
+ indirect_size_get.c \
+ indirect_table.c \
+ glapi.c \
+ glthread.c \
+ glxdri.c \
+ extension_string.c \
+ indirect_util.c \
+ indirect_program.c \
+ indirect_texture_compression.c \
+ glxcmds.c \
+ glxcmdsswap.c \
+ glxext.c \
+ glxdriswrast.c \
+ glxdricommon.c \
+ glxscreens.c \
+ render2.c \
+ render2swap.c \
+ renderpix.c \
+ renderpixswap.c \
+ rensize.c \
+ single2.c \
+ single2swap.c \
+ singlepix.c \
+ singlepixswap.c \
+ singlesize.c \
+ swap_interval.c \
+ xfont.c
+
+COPTS.glxcmds.c= -Wno-error
+COPTS.indirect_dispatch.c= -Wno-error
+COPTS.indirect_dispatch_swap.c= -Wno-error
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/glx \
+ -I${X11SRCDIR.xorg-server}/Xext \
+ -I${X11SRCDIR.MesaLib}/include \
+ -I${X11SRCDIR.MesaLib}/src/glx/x11 \
+ -I${X11SRCDIR.MesaLib}/src/mesa/main \
+ -I${X11SRCDIR.MesaLib}/src/mesa/glapi \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/pixman-1
+
+CPPFLAGS+= \
+ -DGLXEXT \
+ -DGLX_USE_MESA \
+ ${X11FLAGS.DIX}
+
+.include <bsd.x11.mk>
+LIBDIR= ${XMODULEDIR}
+.include <bsd.lib.mk>
