Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

many build updates and fixes for xorg-server 1.9.2.

This commit is contained in:
mrg 2010-11-23 08:22:29 +00:00
parent 1d1ee67612
commit 3cc5930c91
32 changed files with 158 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/mit/xorg/server/drivers/Makefile.xf86-driver vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.xf86-driver,v 1.18 2010/05/23 01:59:13 mrg Exp $
# $NetBSD: Makefile.xf86-driver,v 1.19 2010/11/23 08:22:29 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@ -33,7 +33,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include \
${X11FLAGS.EXTENSION} \
${X11FLAGS.DIX} ${X11INCS.DIX} \
${X11FLAGS.SERVER} \
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \

4
external/mit/xorg/server/xorg-server/Xext/Makefile.Xext vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.Xext,v 1.9 2010/05/22 05:45:01 mrg Exp $
# $NetBSD: Makefile.Xext,v 1.10 2010/11/23 08:22:29 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/Xext
@ -7,9 +7,9 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/Xext
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/Xi
CPPFLAGS+= -DHAVE_DIX_CONFIG_H
#COPTS.mbuf.c+= -Wno-error
COPTS.panoramiX.c+= -Wno-error
COPTS.panoramiXprocs.c+= -Wno-error
COPTS.saver.c+= -Wno-error

3
external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule vendored
View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile.Xextmodule,v 1.8 2010/05/22 05:45:01 mrg Exp $
# $NetBSD: Makefile.Xextmodule,v 1.9 2010/11/23 08:22:29 mrg Exp $
SRCS.Xextmodule= xvmain.c xvdisp.c xvmc.c
SRCS.Xextmodule+= xres.c
SRCS.Xextmodule+= saver.c
#SRCS.Xextmodule+= mbuf.c
SRCS.Xextmodule+= dpms.c

18
external/mit/xorg/server/xorg-server/Xi/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2009/06/11 05:43:15 mrg Exp $
# $NetBSD: Makefile,v 1.3 2010/11/23 08:22:29 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@ -14,7 +14,21 @@ SRCS= allowev.c chgdctl.c chgfctl.c chgkbd.c chgkmap.c chgprop.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 ungrdev.c ungrdevb.c \
ungrdevk.c xiproperty.c
ungrdevk.c \
xiallowev.c \
xichangecursor.c \
xichangehierarchy.c \
xigetclientpointer.c \
xigrabdev.c \
xipassivegrab.c \
xiproperty.c \
xiquerydevice.c \
xiquerypointer.c \
xiqueryversion.c \
xiselectev.c \
xisetclientpointer.c \
xisetdevfocus.c \
xiwarppointer.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \

7
external/mit/xorg/server/xorg-server/dix/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2009/08/23 09:05:44 mrg Exp $
# $NetBSD: Makefile,v 1.10 2010/11/23 08:22:30 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@ -12,7 +12,8 @@ SRCS= atom.c colormap.c cursor.c devices.c dispatch.c dixfonts.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 \
deprecated.c enterleave.c ptrveloc.c registry.c selection.c
deprecated.c enterleave.c ptrveloc.c registry.c selection.c \
eventconvert.c inpututils.c region.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1
@ -24,6 +25,7 @@ CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\" \
-DRGB_DB=\"${X11LIBDIR}/rgb\"
# XXX make user variables
CPPFLAGS.dispatch.c= -DVENDOR_NAME="\"The Xorg Foundation\""
CPPFLAGS.main.c= -DVENDOR_STRING="\"The Xorg Group\"" \
-DVENDOR_RELEASE=${XORG_VERSION_CURRENT} \
-DVENDOR_NAME="\"The Xorg Foundation\""
@ -40,6 +42,7 @@ COPTS.dixfonts.c= -Wno-error
COPTS.events.c= -Wno-error
COPTS.resource.c= -Wno-error
COPTS.window.c= -Wno-error
COPTS.inpututils.c= -Wno-error
.include <bsd.x11.mk>
.include <bsd.lib.mk>

16
external/mit/xorg/server/xorg-server/exa/Makefile.exa vendored
View File

@ -1,9 +1,19 @@
# $NetBSD: Makefile.exa,v 1.3 2009/06/11 05:43:16 mrg Exp $
# $NetBSD: Makefile.exa,v 1.4 2010/11/23 08:22:30 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_glyphs.c
SRCS.exa=\
exa.c \
exa_classic.c \
exa_migration_classic.c \
exa_driver.c \
exa_mixed.c \
exa_migration_mixed.c \
exa_accel.c \
exa_glyphs.c \
exa_offscreen.c \
exa_render.c \
exa_unaccel.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/Xext \

5
external/mit/xorg/server/xorg-server/glx/Makefile.glx vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.glx,v 1.6 2010/07/19 05:34:27 mrg Exp $
# $NetBSD: Makefile.glx,v 1.7 2010/11/23 08:22:30 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@ -54,7 +54,8 @@ CPPFLAGS+= \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= \
-DGLXEXT \

6
external/mit/xorg/server/xorg-server/hw/xfree86/Makefile vendored
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.29 2009/08/27 04:34:52 mrg Exp $
# $NetBSD: Makefile,v 1.30 2010/11/23 08:22:30 mrg Exp $
SUBDIR= common init ddc dixmods doc dri dri2 dummy i2c loader \
SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
x86emu xaa xf86config xf8_16bpp
@ -19,7 +19,7 @@ PROG= Xorg
BINMODE= 4711
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86
SRCS= xorg.c
SRCS= xorg.c libxorg.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/include/fonts \

13
external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2010/05/22 05:45:01 mrg Exp $
# $NetBSD: Makefile,v 1.14 2010/11/23 08:22:31 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@ -17,10 +17,11 @@ SRCS= xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.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 \
xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
xf86Mode.c xorgHelper.c \
${SRCS.xv} ${SRCS.bus} ${SRCS.randr} \
xf86DefModeSet.c
xf86DefModeSet.c \
xf86VGAarbiter.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
SRCS.bus+= xf86sbusBus.c
@ -73,14 +74,16 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
-I${X11SRCDIR.xorg-server}/render \
-I${X11SRCDIR.xorg-server}/randr \
-I.
-I. \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
${X11FLAGS.DIX} \
-DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"' \
-DXVENDORNAME='"The X.Org Foundation"'
-DXVENDORNAME='"The X.Org Foundation"' \
-DHAVE_XORG_CONFIG_H
.if ${MACHINE_ARCH} == "i386"
CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT

4
external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2009/06/12 01:59:05 mrg Exp $
# $NetBSD: Makefile,v 1.4 2010/11/23 08:22:31 mrg Exp $
LIBISPRIVATE=yes
@ -7,7 +7,7 @@ LIBISPRIVATE=yes
LIB= ddc
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
SRCS= xf86DDC.c edid.c interpret_edid.c print_edid.c ddcProperty.c
SRCS= ddc.c interpret_edid.c print_edid.c ddcProperty.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \

5
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.dixmod,v 1.5 2009/06/11 05:43:16 mrg Exp $
# $NetBSD: Makefile.dixmod,v 1.6 2010/11/23 08:22:31 mrg Exp $
.include <bsd.own.mk>
@ -14,7 +14,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods \
-I${X11SRCDIR.xorg-server}/glx \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}

8
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2009/08/22 02:40:27 mrg Exp $
# $NetBSD: Makefile,v 1.5 2010/11/23 08:22:31 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@ -10,10 +10,8 @@ LIB= dbe
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
SRCS= ${SRCS.dbe} dbemodule.c
# XXX should we be installing xorg-config.h?
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= -DHAVE_XORG_CONFIG_H
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+= -DHAVE_XORG_CONFIG_H ${X11INCS.DIX}
COPTS.dbe.c+= -Wno-error

8
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2010/05/22 05:45:01 mrg Exp $
# $NetBSD: Makefile,v 1.10 2010/11/23 08:22:32 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@ -20,13 +20,13 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-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}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/Xext \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/../include
-I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+= ${X11FLAGS.DIX} \
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} \
-DHAVE_XORG_CONFIG_H
# XXX

4
external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile vendored
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
# $NetBSD: Makefile,v 1.5 2010/11/23 08:22:32 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.rapidaccess
FILES= README.modes
FILESDIR= ${X11USRLIBDIR}/X11/doc

5
external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2010/05/22 22:50:23 mrg Exp $
# $NetBSD: Makefile,v 1.10 2010/11/23 08:22:32 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@ -28,7 +28,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= -DXF86DRI \
${X11FLAGS.DIX}

5
external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2010/05/22 22:50:23 mrg Exp $
# $NetBSD: Makefile,v 1.6 2010/11/23 08:22:32 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@ -29,7 +29,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= -DXF86DRI \
${X11FLAGS.DIX}

5
external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:05 mrg Exp $
# $NetBSD: Makefile,v 1.5 2010/11/23 08:22:32 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -19,7 +19,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \
-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${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}

5
external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
# $NetBSD: Makefile,v 1.6 2010/11/23 08:22:33 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@ -44,7 +44,8 @@ CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
-DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"' \
-DXVENDORNAME='"The X.Org Foundation"'
-DXVENDORNAME='"The X.Org Foundation"' \
-DHAVE_XORG_CONFIG_H
.if ${MACHINE_ARCH} == "i386"
CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT

13
external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2009/07/02 04:27:05 macallan Exp $
# $NetBSD: Makefile,v 1.7 2010/11/23 08:22:33 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@ -6,8 +6,7 @@
LIB= loader
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
SRCS= loader.c loadext.c loadmod.c dlloader.c os.c dixsym.c \
extsym.c misym.c xf86sym.c
SRCS= loader.c loadext.c loadmod.c dlloader.c os.c sdksyms.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
#SRCS+= SparcMulDiv.S
@ -27,6 +26,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/os \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/xfixes \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
@ -41,11 +41,10 @@ CPPFLAGS+= -DUseMMAP
.endif
CPPFLAGS.loadmod.c= ${X11FLAGS.EXTENSION} -DDEFAULT_MODULE_PATH=\"${X11USRLIBDIR}/modules\"
CPPFLAGS.xf86sym.c= ${X11FLAGS.EXTENSION}
CPPFLAGS.dixsym.c= ${X11FLAGS.EXTENSION}
CPPFLAGS.sdksyms.c= ${X11FLAGS.EXTENSION}
COPTS.dixsym.c= -Wno-error
COPTS.misym.c= -Wno-error
#COPTS.sdksyms.c= -Wno-error
COPTS.loadmod.c= -Wno-error
.include <bsd.x11.mk>
.include <bsd.lib.mk>

5
external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
# $NetBSD: Makefile,v 1.5 2010/11/23 08:22:33 mrg Exp $
#XMODULEDIR= ${X11USRLIBDIR}/modules
@ -17,7 +17,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}

6
external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
# $NetBSD: Makefile,v 1.5 2010/11/23 08:22:33 mrg Exp $
PROG= cvt
SRCS= cvt.c xf86cvt.c
@ -14,8 +14,8 @@ CPPFLAGS+= ${X11FLAGS.DIX} -DHAVE_XORG_CONFIG_H \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser
LDADD+= ${LIBDUMMY}
DPADD+= ${LIBDUMMY}
LDADD+= -lm
DPADD+= ${LIBM}
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG}
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/modes

9
external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2009/02/14 13:32:13 abs Exp $
# $NetBSD: Makefile,v 1.6 2010/11/23 08:22:33 mrg Exp $
.include <bsd.own.mk>
@ -11,14 +11,13 @@ MKMAN= no
CPPFLAGS+= -DHAVE_XORG_CONFIG_H \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dummylib
-I${X11SRCDIR.xorg-server}/../include
LDADD= -L${XORGOSOBJDIR} -lxorgos \
-L${DUMMYOBJDIR} -ldummy -lm
-L${DUMMYOBJDIR} -lm
DPADD= ${LIBXORGOS} ${LIBDUMMY} ${LIBM}
DPADD= ${LIBXORGOS} ${LIBM}
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386

9
external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2009/02/14 13:32:13 abs Exp $
# $NetBSD: Makefile,v 1.6 2010/11/23 08:22:34 mrg Exp $
.include <bsd.own.mk>
@ -10,13 +10,12 @@ MAN= pcitweak.1
CPPFLAGS+= -DHAVE_XORG_CONFIG_H \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dummylib
-I${X11SRCDIR.xorg-server}/../include
LDADD= -L${XORGOSOBJDIR} -lxorgos \
-L${DUMMYOBJDIR} -ldummy -lm
-L${DUMMYOBJDIR} -lm
DPADD= ${LIBXORGOS} ${LIBDUMMY} ${LIBM}
DPADD= ${LIBXORGOS} ${LIBM}
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386

9
external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2009/02/14 13:32:13 abs Exp $
# $NetBSD: Makefile,v 1.7 2010/11/23 08:22:34 mrg Exp $
.include <bsd.own.mk>
@ -11,15 +11,14 @@ CPPFLAGS+= -DHAVE_XORG_CONFIG_H \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include \
-I${X11SRCDIR.xorg-server}/hw/xfree86/scanpci \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dummylib
-I${X11SRCDIR.xorg-server}/hw/xfree86/scanpci
LDADD= -L${SCANPCIOBJDIR} -lscanpci \
-Wl,-rpath,${X11USRLIBDIR}/modules \
-L${XORGOSOBJDIR} -lxorgos \
-L${DUMMYOBJDIR} -ldummy -lm
-L${DUMMYOBJDIR} -lm
DPADD= ${LIBSCANPCI} ${LIBXORGOS} ${LIBDUMMY} ${LIBM}
DPADD= ${LIBSCANPCI} ${LIBXORGOS} ${LIBM}
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386

5
external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
# $NetBSD: Makefile,v 1.6 2010/11/23 08:22:34 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -40,7 +40,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xorg-server}/include/extensions \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/miext/cw \
-I${X11SRCDIR.xorg-server}/render
-I${X11SRCDIR.xorg-server}/render \
-I${X11SRCDIR.xorg-server}/../include
# XXX to find files lokoing for "../../../../hw/something"
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \

8
external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2008/08/09 01:15:19 rtr Exp $
# $NetBSD: Makefile,v 1.2 2010/11/23 08:22:34 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@ -8,7 +8,8 @@ LIB= xf86config
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/parser
SRCS= DRI.c Device.c Extensions.c Files.c Flags.c Input.c Layout.c \
Module.c Monitor.c Pointer.c Screen.c Vendor.c Video.c read.c \
scan.c write.c
scan.c write.c \
InputClass.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/include \
@ -17,7 +18,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}

22
external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2009/06/12 01:59:06 mrg Exp $
# $NetBSD: Makefile,v 1.4 2010/11/23 08:22:34 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@ -6,8 +6,17 @@
LIB= xf86modes
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/modes
SRCS= xf86Crtc.c xf86Cursors.c xf86cvt.c xf86gtf.c xf86DiDGA.c \
xf86EdidModes.c xf86Modes.c xf86RandR12.c xf86Rotate.c
SRCS=\
xf86Crtc.c \
xf86Cursors.c \
xf86cvt.c \
xf86gtf.c \
xf86DisplayIDModes.c \
xf86EdidModes.c \
xf86Modes.c \
xf86RandR12.c \
xf86Rotate.c \
xf86DiDGA.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
@ -22,11 +31,14 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ramdac \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/xfixes \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
CPPFLAGS+= ${X11FLAGS.DIX} \
-DHAVE_XORG_CONFIG_H
# XXX
CPPFLAGS.xf86RandR12.c= -Wno-error

23
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.24 2010/11/18 08:20:17 mrg Exp $
# $NetBSD: Makefile,v 1.25 2010/11/23 08:22:35 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@ -21,7 +21,7 @@ SRCS.bsd+= pm_noop.c
SRCS.bsd+= bsd_apm.c
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SRCS.bsd+= i386_video.c stdResource.c lnx_agp.c
SRCS.bsd+= i386_video.c lnx_agp.c
.for _FN in ${SRCS.bsd}
.if ${MACHINE_ARCH} == "i386"
CPPFLAGS.${_FN}+= -DPCCONS_SUPPORT -DHAS_APERTURE_DRV
@ -33,21 +33,21 @@ CPPFLAGS.${_FN}+= -DUSE_I386_IOPL -DPCVT_SUPPORT -DWSCONS_SUPPORT \
.endif
.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc"
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c lnx_agp.c
SRCS.bsd+= ppc_video.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
.endif
.if ${MACHINE_ARCH} == "alpha"
SRCS.bsd+= alpha_video.c bsd_ev56.c stdResource.c pm_noop.c agp_noop.c
SRCS.bsd+= alpha_video.c bsd_ev56.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_ALPHA_PIO
.endfor
.endif
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
SRCS.bus+= netbsdSbus.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@ -56,7 +56,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.if ${MACHINE} == "hpcmips" || \
${MACHINE} == "sgimips"
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
@ -67,16 +67,15 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "zaurus"
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
CPPFLAGS.arm_video.c= -Wno-error
.endif
.if ${MACHINE} == "dreamcast" || \
${MACHINE} == "hpcsh"
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
@ -100,9 +99,6 @@ SRCS.bus+= Pci.c
#CPPFLAGS.netbsdPci.c+= -DPCI_VIA_TTYE0
.endif
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc
SRCS.misc= Delay.c
# XXX .S not built from automake either
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
@ -120,7 +116,8 @@ SRCS.misc= Delay.c
#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
.endif
SRCS.misc+= BUSmemcpy.c SlowBcopy.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc
SRCS.misc+= SlowBcopy.c
# XXX namespace collision so avoid it, only has to be done for non-i386.
#BUILDSYMLINKS= BUSmemcpy.c CBUSmemcpy.c \

15
external/mit/xorg/server/xorg-server/include/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2009/07/05 21:30:30 mrg Exp $
# $NetBSD: Makefile,v 1.8 2010/11/23 08:22:35 mrg Exp $
.include <bsd.own.mk>
@ -23,17 +23,19 @@ XF86_SUBDIR= common ddc dixmods/extmod dri fbdevhw i2c int10 modes \
INCSDIR=${X11INCDIR}/xorg
INCS= BT.h IBM.h TI.h XIstubs.h bstore.h \
bstorestr.h bt829.h \
closestr.h closure.h colormap.h \
callback.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 \
eventconvert.h events.h eventstr.h list.h \
extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \
fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.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 \
mi.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 \
os.h picture.h picturestr.h pixmap.h pixmapstr.h property.h \
protocol-versions.h \
propertyst.h randrstr.h region.h regionstr.h renderedge.h resource.h \
rgb.h sarea.h screenint.h scrnintstr.h selection.h servermd.h \
shadow.h shadowfb.h site.h swaprep.h swapreq.h tda8425.h tda9850.h \
@ -43,14 +45,15 @@ INCS= BT.h IBM.h TI.h XIstubs.h bstore.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 xf86Xinput.h xf86_OSlib.h \
xf86Priv.h xf86Privstr.h xf86RamDac.h xf86RandR12.h \
xf86Rename.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 dri2.h rrtransform.h
xvmcext.h hotplug.h xkbsrv.h dix-config.h dri2.h rrtransform.h \
xsha1.h version-config.h
.include <bsd.x11.mk>
.include <bsd.prog.mk>

6
external/mit/xorg/server/xorg-server/mi/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2009/08/22 02:40:27 mrg Exp $
# $NetBSD: Makefile,v 1.8 2010/11/23 08:22:35 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@ -6,13 +6,13 @@
LIB= mi
.PATH: ${X11SRCDIR.xorg-server}/mi
SRCS= miarc.c mibank.c mibitblt.c mibstore.c \
SRCS= miarc.c mibitblt.c mibstore.c micopy.c \
micmap.c micursor.c midash.c midispcur.c mieq.c \
miexpose.c mifillarc.c mifillrct.c mifpolycon.c \
migc.c miglblt.c mioverlay.c mipointer.c mipoly.c \
mipolycon.c mipolygen.c mipolypnt.c mipolyrect.c \
mipolyseg.c mipolytext.c mipolyutil.c mipushpxl.c \
miregion.c miscrinit.c mispans.c misprite.c \
miscrinit.c mispans.c misprite.c \
mivaltree.c miwideline.c miwindow.c mizerarc.c \
mizerclip.c mizerline.c

7
external/mit/xorg/server/xorg-server/os/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:27 mrg Exp $
# $NetBSD: Makefile,v 1.8 2010/11/23 08:22:35 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@ -9,7 +9,7 @@ LIB= os
SRCS= WaitFor.c access.c auth.c connection.c io.c mitauth.c \
oscolor.c osinit.c utils.c xdmauth.c \
xstrans.c xprintf.c log.c xdmcp.c \
rpcauth.c backtrace.c
rpcauth.c backtrace.c xsha1.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
@ -26,7 +26,8 @@ CPPFLAGS+= ${X11FLAGS.DIX} \
-DHASXDMAUTH \
${X11FLAGS.OS_DEFINES} \
-DUSE_RGB_TXT \
-UDDXTIME
-UDDXTIME \
-DHAVE_SHA1_IN_LIBC
.include "../Makefile.common"

9
external/mit/xorg/server/xorg-server/xkb/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2010/05/20 12:51:17 christos Exp $
# $NetBSD: Makefile,v 1.8 2010/11/23 08:22:35 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@ -8,9 +8,9 @@ LIB= xkb
.PATH: ${X11SRCDIR.xorg-server}/${LIB}
.PATH: ${X11SRCDIR.X11}/src
.PATH: ${X11SRCDIR.xkbfile}/src
DDXSRCS= ddxBeep.c ddxCtrls.c ddxFakeMtn.c \
ddxInit.c ddxKeyClick.c ddxLEDs.c ddxLoad.c \
ddxList.c ddxDevBtn.c
DDXSRCS= ddxBeep.c ddxCtrls.c \
ddxLEDs.c ddxLoad.c \
ddxList.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 \
@ -26,6 +26,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/Xext/extmod \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.xorg-server}/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/../include