Module Name: src
Committed By: mrg
Date: Fri Jun 12 01:59:07 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers: Makefile Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile
src/external/mit/xorg/server/drivers/xf86-video-wsfb: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xextbuiltin
Makefile.Xextmodule
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
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/ddc: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/glx:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: 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/pcidata: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp: 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
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common:
modeline2c.awk
Log Message:
build updates for xorg-server 1.6.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.26 -r1.27 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/modeline2c.awk
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/glx/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
cvs rdiff -u -r1.3 -r1.4 \
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/i2c/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
cvs rdiff -u -r1.3 -r1.4 \
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/vbe/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/include/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/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.27 src/external/mit/xorg/server/drivers/Makefile:1.28
--- src/external/mit/xorg/server/drivers/Makefile:1.27 Fri Apr 10 17:00:45 2009
+++ src/external/mit/xorg/server/drivers/Makefile Fri Jun 12 01:59:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/04/10 17:00:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.28 2009/06/12 01:59:04 mrg Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -91,11 +91,19 @@
xf86-video-cirrus \
xf86-video-cirrus_alpine \
xf86-video-cirrus_laguna \
- xf86-video-cyrix \
+
+# replace with xf86-video-geode
+# xf86-video-cyrix \
+
+SUBDIR+= \
xf86-video-glint \
xf86-video-i128 \
xf86-video-i740 \
- xf86-video-imstt \
+
+# needs porting for xorg-server 1.6
+# xf86-video-imstt \
+
+SUBDIR+= \
xf86-video-intel \
xf86-video-mach64 \
xf86-video-mga \
@@ -115,10 +123,11 @@
xf86-video-trident \
xf86-video-tseng \
xf86-video-vga \
- xf86-video-via
+
+# replace with xf86-video-openchrome
+# xf86-video-via
.endif
-#xf86-video-wsfb
#xf86-video-rendition
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.14 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.15
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.14 Fri Jun 5 23:34:36 2009
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Fri Jun 12 01:59:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.14 2009/06/05 23:34:36 ahoka Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.15 2009/06/12 01:59:04 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -36,6 +36,9 @@
${X11FLAGS.EXTENSION} \
${X11FLAGS.DIX} ${X11INCS.DIX} \
${X11FLAGS.SERVER} \
+ -DHAVE_XORG_SERVER_1_1_0 \
+ -DSERVER_1_5 \
+ -DXSERVER_LIBPCIACCESS \
-DXFree86LOADER
CPPFLAGS+= -DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
Index: src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.3 Sun Aug 3 09:24:14 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Fri Jun 12 01:59:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/03 09:24:14 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:04 mrg Exp $
DRIVER= xf86-video-tdfx
DRIVER_NAME= tdfx_drv
@@ -11,4 +11,6 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+COPTS.tdfx_driver.c= -Wno-error # XXX deprecated
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.3 Tue Nov 4 22:21:17 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile Fri Jun 12 01:59:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/11/04 22:21:17 macallan Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:04 mrg Exp $
DRIVER= xf86-video-wsfb
DRIVER_NAME= wsfb_drv
@@ -6,4 +6,6 @@
SRCS= wsfb_driver.c wsfb_cursor.c
MAN= wsfb.4
+CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.9 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.10
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.9 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Fri Jun 12 01:59:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.9 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.10 2009/06/12 01:59:04 mrg Exp $
.for _SL in \
mi \
@@ -8,7 +8,6 @@
Xext \
Xext/Xextbuiltin \
dbe \
- XTrap \
record \
render \
randr \
@@ -24,18 +23,15 @@
os \
dix \
config \
+ glx \
hw/xnest \
hw/xfree86/common \
hw/xfree86/ddc \
hw/xfree86/dixmods \
- hw/xfree86/dixmods/afb \
- hw/xfree86/dixmods/cfb \
- hw/xfree86/dixmods/cfb32 \
hw/xfree86/dixmods/dbe \
hw/xfree86/dixmods/extmod \
hw/xfree86/dixmods/fb \
hw/xfree86/dixmods/freetype \
- hw/xfree86/dixmods/mfb \
hw/xfree86/dixmods/record \
hw/xfree86/dixmods/shadow \
hw/xfree86/dixmods/type1 \
@@ -59,8 +55,6 @@
hw/xfree86/vgahw \
hw/xfree86/x86emu \
hw/xfree86/xaa \
- hw/xfree86/xf1bpp \
- hw/xfree86/xf4bpp \
hw/xfree86/xf8_16bpp \
hw/xfree86/xf8_32bpp \
hw/xfree86/xf86config \
Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.5 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.6
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.5 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin Fri Jun 12 01:59:04 2009
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.Xextbuiltin,v 1.5 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile.Xextbuiltin,v 1.6 2009/06/12 01:59:04 mrg Exp $
-SRCS.Xextbuiltin= shape.c sleepuntil.c xtest.c
+SRCS.Xextbuiltin= bigreq.c geext.c shape.c sleepuntil.c \
+ sync.c xcmisc.c xtest.c
SRCS.Xextbuiltin+= shm.c
SRCS.Xextbuiltin+= panoramiX.c panoramiXprocs.c panoramiXSwap.c
SRCS.Xextbuiltin+= xace.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.6 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule:1.7
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule:1.6 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule Fri Jun 12 01:59:04 2009
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.Xextmodule,v 1.6 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile.Xextmodule,v 1.7 2009/06/12 01:59:04 mrg Exp $
-SRCS.Xextmodule= bigreq.c sync.c xcmisc.c
-SRCS.Xextmodule+= xvmain.c xvdisp.c xvmc.c
+SRCS.Xextmodule= xvmain.c xvdisp.c xvmc.c
SRCS.Xextmodule+= xres.c
SRCS.Xextmodule+= saver.c
SRCS.Xextmodule+= mbuf.c
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.1 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.2
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.1 Thu Jun 11 05:43:16 2009
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Fri Jun 12 01:59:04 2009
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile.glx,v 1.1 2009/06/11 05:43:16 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.2 2009/06/12 01:59:04 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 \
+ 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 \
@@ -46,6 +46,7 @@
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.MesaLib}/include \
-I${X11SRCDIR.MesaLib}/src/glx/x11 \
+ -I${X11SRCDIR.MesaLib}/src/mesa \
-I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
-I${DESTDIR}${X11INCDIR}/X11 \
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.7 Thu Jun 11 05:43:16 2009
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Fri Jun 12 01:59:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/11 05:43:16 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2009/06/12 01:59:04 mrg Exp $
.include <bsd.own.mk>
@@ -70,6 +70,7 @@
${LDADD.xkbstubs} \
${LDADD.composite} \
${LDADD.os} \
+ ${LDADD.glx} \
-lXfont \
-lfreetype \
-lXau \
@@ -85,8 +86,7 @@
${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.os} \
- ${LIBCWRAPPER} \
+ ${DPADD.xkb} ${DPADD.composite} ${DPADD.os} ${DPADD.glx} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} \
${LIBCRYPTO}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.26 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.27
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.26 Thu Jun 11 05:43:16 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Fri Jun 12 01:59:04 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2009/06/11 05:43:16 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2009/06/12 01:59:04 mrg Exp $
SUBDIR= common init ddc dixmods doc dri dri2 dummy i2c int10 loader \
xf86modes exa \
- xorgos ramdac pcidata shadowfb vbe vgahw \
+ xorgos ramdac shadowfb vbe vgahw \
x86emu xaa xf86config xf8_16bpp
SUBDIR+= .WAIT utils
@@ -62,9 +62,13 @@
LDADD+= ${LDADD.Xi}
LDADD+= ${LDADD.xkb}
LDADD+= ${LDADD.os}
+LDADD+= ${LDADD.glx}
+LDADD+= ${LDADD.hw/xfree86/dri}
LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
+LDADD+= -lpciaccess -ldrm
+LDADD+= -lcrypto
LDADD+= -Wl,--no-whole-archive
.if ${MACHINE_ARCH} == "i386"
@@ -87,7 +91,6 @@
${DPADD.Xext} \
${DPADD.config} \
${DPADD.dbe} \
- ${DPADD.XTrap} \
${DPADD.record} \
${DPADD.render} \
${DPADD.randr} \
@@ -99,6 +102,8 @@
${DPADD.xkb} \
${DPADD.composite} \
${DPADD.os} \
+ ${DPADD.glx} \
+ ${DPADD.hw/xfree86/dri} \
${DPADD.hw/xfree86/dixmods/fb} \
${DPADD.hw/xfree86/fb} \
${DPADD.hw/xfree86/init} \
@@ -111,7 +116,8 @@
${DPADD.hw/xfree86/i2c} \
${LIBCWRAPPER} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
- ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM}
+ ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
+ ${LIBCRYPTO}
SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X
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.9 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.9 Thu Jun 11 05:43:16 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Fri Jun 12 01:59:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/06/11 05:43:16 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2009/06/12 01:59:04 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@@ -16,9 +16,11 @@
xf86Cursor.c xf86DGA.c xf86DPMS.c \
xf86Events.c xf86Globals.c xf86AutoConfig.c \
xf86Option.c \
+ xf86VidMode.c xf86fbman.c xf86cmap.c \
xf86Helper.c xf86PM.c xf86RAC.c xf86Xinput.c xisb.c \
xf86Mode.c xorgHelper.c \
- ${SRCS.xv} ${SRCS.bus} ${SRCS.randr}
+ ${SRCS.xv} ${SRCS.bus} ${SRCS.randr} \
+ xf86DefModeSet.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
SRCS.bus+= xf86sbusBus.c
@@ -42,7 +44,8 @@
cat \
${X11SRCDIR.xorg-server}/hw/xfree86/common/vesamodes \
${X11SRCDIR.xorg-server}/hw/xfree86/common/extramodes | \
- ${TOOL_AWK} -f ${.CURDIR}/modeline2c.awk > ${.TARGET}
+ ${TOOL_AWK} -f ${X11SRCDIR.xorg-server}/hw/xfree86/common/modeline2c.awk > ${.TARGET}
+ @echo >> ${.TARGET}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
@@ -119,6 +122,7 @@
COPTS.xf86Config.c= -Wno-error
COPTS.xf86Cursor.c= -Wno-error
COPTS.xf86RandR.c= -Wno-error
+COPTS.xf86Helper.c= -Wno-error
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.2 Fri Aug 29 07:46:19 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile Fri Jun 12 01:59:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/29 07:46:19 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/12 01:59:05 mrg Exp $
LIBISPRIVATE=yes
@@ -13,6 +13,7 @@
-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}/Xext \
-I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c
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.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.6 Thu Jun 11 05:43:16 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Fri Jun 12 01:59:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/11 05:43:16 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/12 01:59:05 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -22,11 +22,9 @@
-DXFree86LOADER
SUBDIR = \
- GLcore \
dbe \
extmod \
fb \
- glx \
record \
shadow \
wfb \
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.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.6 Thu Jun 11 05:43:16 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile Fri Jun 12 01:59:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/11 05:43:16 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/12 01:59:05 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -10,7 +10,6 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
SRCS= xf86dga2.c \
xvmod.c \
- xf86misc.c \
xf86vmode.c \
modinit.c
@@ -21,6 +20,7 @@
-I${X11SRCDIR.xorg-server}/hw/xfree86/dbe \
-I${X11SRCDIR.xorg-server}/hw/xfree86/hw/xfree86/loader \
-I${X11SRCDIR.xorg-server}/hw/xfree86/miext/shadow \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/glx/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/glx/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/glx/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/glx/Makefile:1.1 Thu Sep 25 14:15:06 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/glx/Makefile Fri Jun 12 01:59:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/25 14:15:06 rtr Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -10,4 +10,6 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
SRCS= ${SRCS.glx} glxmodule.c
-.include "../../../../GL/glx/Makefile.glx"
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/${LIB}
+
+.include "../../../../glx/Makefile.glx"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile:1.1 Wed Aug 6 07:16:40 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile Fri Jun 12 01:59:05 2009
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $
LIB= wfb
SRCS= fbmodule.c fbcmap_mi.c
CPPFLAGS+= -DFB_ACCESS_WRAPPER \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/fb
.include "../Makefile.dixmod"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile:1.1 Wed Aug 6 07:16:40 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile Fri Jun 12 01:59:05 2009
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $
LIB= xorgxkb
SRCS= xkbVT.c xkbPrivate.c xkbKillSrv.c
+CPPFLAGS= -I${X11SRCDIR.xorg-server}/Xext
+
.include "../Makefile.dixmod"
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.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.5 Thu Jun 11 05:43:17 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile Fri Jun 12 01:59:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/12 01:59:05 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -22,6 +22,7 @@
-I${X11SRCDIR.xorg-server}/i2c \
-I${X11SRCDIR.xorg-server}/parser \
-I${X11SRCDIR.xorg-server}/ramdac \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.MesaLib}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.1 Thu Jun 11 17:59:25 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile Fri Jun 12 01:59:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/11 17:59:25 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -15,6 +15,7 @@
-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}/xfixes \
-I${X11SRCDIR.xorg-server}/glx \
-I${X11SRCDIR.xorg-server}/GL/include \
-I${X11SRCDIR.xorg-server}/modes \
@@ -22,6 +23,7 @@
-I${X11SRCDIR.xorg-server}/i2c \
-I${X11SRCDIR.xorg-server}/parser \
-I${X11SRCDIR.xorg-server}/ramdac \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.MesaLib}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
@@ -32,8 +34,6 @@
CPPFLAGS+= -DXF86DRI \
${X11FLAGS.DIX}
-CPPFLAGS.dri.c= -Wno-error
-
LIBDPLIBS= drm ${.CURDIR}/../../../../../lib/libdrm
.include <bsd.x11.mk>
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.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile:1.3 Thu Jun 11 05:43:17 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile Fri Jun 12 01:59:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:05 mrg Exp $
MKX11LOADABLE=no
@@ -22,6 +22,7 @@
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dummylib \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile Fri Jun 12 01:59:05 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/12 01:59:05 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -18,6 +18,7 @@
-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include
CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.4 Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Fri Jun 12 01:59:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/02/14 13:32:13 abs Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@@ -36,6 +36,7 @@
-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
-I${X11SRCDIR.xorg-server}/render \
-I${X11SRCDIR.xorg-server}/randr \
+ -I${X11SRCDIR.xorg-server}/../include \
-I.
CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
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.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.4 Thu Jun 11 05:43:17 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Fri Jun 12 01:59:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -20,8 +20,10 @@
CPPFLAGS+= -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}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/x86emu \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
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.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.4 Thu Jun 11 05:43:17 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Fri Jun 12 01:59:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -6,7 +6,7 @@
LIB= loader
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
-SRCS= loader.c loadext.c loadmod.c loadfont.c dlloader.c os.c dixsym.c \
+SRCS= loader.c loadext.c loadmod.c dlloader.c os.c dixsym.c \
extsym.c misym.c xf86sym.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile:1.4 Wed Jun 10 02:20:13 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile Fri Jun 12 01:59:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/10 02:20:13 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
# XXX this one is installed in modular-xorg-server
@@ -11,7 +11,6 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/scanpci
SRCS= xf86PciData.c
-DPSRCS+=xf86PciIds.h
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.3 Fri Aug 15 15:55:06 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile Fri Jun 12 01:59:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/15 15:55:06 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
#XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -13,6 +13,7 @@
xf86BitOrder.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile Fri Jun 12 01:59:06 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/12 01:59:06 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -11,6 +11,7 @@
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
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.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.3 Thu Jun 11 05:43:17 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile Fri Jun 12 01:59:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
PROG= cvt
SRCS= cvt.c xf86cvt.c
@@ -9,6 +9,7 @@
CPPFLAGS+= ${X11FLAGS.DIX} -DHAVE_XORG_CONFIG_H \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/../include \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser
@@ -17,7 +18,7 @@
DPADD+= ${LIBDUMMY}
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG}
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/common
+.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/modes
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile Fri Jun 12 01:59:06 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/12 01:59:06 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -12,6 +12,7 @@
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile Fri Jun 12 01:59:06 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/12 01:59:06 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -13,6 +13,7 @@
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
-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}/Xext \
-I${X11SRCDIR.xorg-server}/cfb \
-I${X11SRCDIR.xorg-server}/mfb \
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.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.4 Thu Jun 11 05:43:17 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile Fri Jun 12 01:59:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -39,6 +39,7 @@
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/include/extensions \
-I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/miext/cw \
-I${X11SRCDIR.xorg-server}/render
# XXX to find files lokoing for "../../../../hw/something"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.2 Fri Aug 15 15:55:06 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile Fri Jun 12 01:59:06 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/12 01:59:06 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -6,7 +6,7 @@
LIB= xf86modes
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/modes
-SRCS= xf86Crtc.c xf86Cursors.c xf86cvt.c xf86DiDGA.c \
+SRCS= xf86Crtc.c xf86Cursors.c xf86cvt.c xf86gtf.c xf86DiDGA.c \
xf86EdidModes.c xf86Modes.c xf86RandR12.c xf86Rotate.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
@@ -21,6 +21,7 @@
-I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ramdac \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile Fri Jun 12 01:59:07 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/12 01:59:07 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -11,10 +11,8 @@
SRCS= xf8_16module.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xorg-server}/mfb \
- -I${X11SRCDIR.xorg-server}/cfb \
-I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
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.14 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.14 Thu Jun 11 05:43:17 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Fri Jun 12 01:59:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2009/06/12 01:59:07 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -9,7 +9,7 @@
.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_VTsw.c bsd_bell.c bsd_init.c bsd_pci.c \
kmod_noop.c \
posix_tty.c sigio.c vidmem.c
@@ -76,10 +76,6 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus
SRCS.bus+= Pci.c
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SRCS.bus+= ix86Pci.c
-.endif
-
.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
@@ -93,7 +89,7 @@
.endif
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc
-SRCS.misc= xf86_Util.c Delay.c
+SRCS.misc= Delay.c
# XXX .S not built from automake either
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -111,6 +107,7 @@
#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
.endif
+SRCS.misc+= BUSmemcpy.c SlowBcopy.c
# XXX namespace collision so avoid it, only has to be done for non-i386.
#BUILDSYMLINKS= BUSmemcpy.c CBUSmemcpy.c \
@@ -129,6 +126,7 @@
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared \
-I${X11SRCDIR.xc}/extras/drm/shared
.if ${X11DRI} != "no"
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.9 Thu Jun 11 05:43:18 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Fri Jun 12 01:59:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/06/11 05:43:18 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2009/06/12 01:59:07 mrg Exp $
.include <bsd.own.mk>
@@ -64,6 +64,7 @@
${LDADD.xkbstubs} \
${LDADD.composite} \
${LDADD.os} \
+ ${LDADD.glx} \
-lXfont -lXext -lfontenc \
-lpixman-1 -lX11 -lXau \
-lXdmcp -lfreetype -lm -lcrypto
@@ -86,6 +87,7 @@
${DPADD.xkb} \
${DPADD.composite} \
${DPADD.os} \
+ ${DPADD.glx} \
${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.5 src/external/mit/xorg/server/xorg-server/include/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.5 Thu Jun 11 05:43:18 2009
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Fri Jun 12 01:59:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/06/11 05:43:18 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/12 01:59:07 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
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 \
- vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp
+ vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp dri2
.for _dir in ${XORGINC_SUBDIR}
.PATH: ${XORGSRC}/${_dir}
@@ -50,7 +50,7 @@
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
+ xvmcext.h hotplug.h xkbsrv.h dix-config.h dri2.h rrtransform.h
.include <bsd.x11.mk>
.include <bsd.prog.mk>
