build the modes, shadowfb, vbe, vgahw and xaa subdirs from hw/xfree86.
This commit is contained in:
mrg
parent
73881326b7
commit
ca75fb56f4
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: TODO,v 1.10 2008/08/06 04:17:07 mrg Exp $
|
||||
$NetBSD: TODO,v 1.11 2008/08/06 05:10:40 mrg Exp $
|
||||
|
||||
plan:
|
||||
- build modular-xorg stuff with reach over
|
||||
|
|
@ -44,9 +44,9 @@ Xserver
|
|||
- hw/xnest is done
|
||||
- hw/vfb is done
|
||||
- some of hw/xfree86 is done:
|
||||
common ddc doc dri dummy exa i2c int10 loader os-support rac ramdac scanpci utils
|
||||
common ddc doc dri dummy exa i2c int10 loader modes os-support rac ramdac scanpci shadowfb utils vbe vgahw xaa
|
||||
- hw/xfree86 not done:
|
||||
dixmods modes shadowfb vbe vgahw x86emu xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp
|
||||
dixmods x86emu xf1bpp xf4bpp xf8_16bpp xf8_32bpp
|
||||
- hw/xgl
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.12 2008/08/06 04:15:06 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2008/08/06 05:10:40 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -48,10 +48,6 @@ SUBDIR+= damageext XTrap composite exa config hw
|
|||
# XXX stuff installed by modular-xorg-server we need to deal with:
|
||||
#libpcidata
|
||||
#libshadow
|
||||
#libshadowfb
|
||||
#libvbe
|
||||
#libvgahw
|
||||
#libxaa
|
||||
|
||||
#bin/X
|
||||
#bin/Xorg
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.6 2008/08/05 05:58:52 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2008/08/06 05:10:40 mrg Exp $
|
||||
|
||||
SUBDIR= common ddc doc dri dummy i2c int10 loader modes \
|
||||
os-support rac ramdac scanpci shadowfb vbe vgahw \
|
||||
xaa
|
||||
|
||||
SUBDIR= common ddc doc dri dummy i2c int10 loader \
|
||||
os-support rac ramdac scanpci
|
||||
SUBDIR+= .WAIT utils
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
|
||||
|
||||
.include "../../../Makefile.serverlib"
|
||||
.include "../../../Makefile.servermod"
|
||||
|
||||
LIB= xf86modes
|
||||
|
||||
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/modes
|
||||
SRCS= xf86Crtc.c xf86Cursors.c xf86cvt.c xf86DiDGA.c \
|
||||
xf86EdidModes.c xf86Modes.c xf86RandR12.c xf86Rotate.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/rac \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
|
||||
-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}/hw/xfree86/vgahw \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/ramdac \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${DESTDIR}${X11INCDIR}/xorg \
|
||||
-I${XSERVERINCDIR}
|
||||
|
||||
CPPFLAGS+= ${X11FLAGS.DIX}
|
||||
|
||||
# XXX
|
||||
CPPFLAGS.xf86RandR12.c= -Wno-error
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
LIBDIR= ${XMODULEDIR}
|
||||
.include <bsd.lib.mk>
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
|
||||
|
||||
XMODULEDIR= ${X11USRLIBDIR}/modules
|
||||
|
||||
.include "../../../Makefile.serverlib"
|
||||
.include "../../../Makefile.servermod"
|
||||
|
||||
LIB= shadowfb
|
||||
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
|
||||
SRCS= sfbmodule.c shadow.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
|
||||
-I${X11SRCDIR.xorg-server}/mi \
|
||||
-I${X11SRCDIR.xorg-server}/include \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${DESTDIR}${X11INCDIR}/xorg \
|
||||
-I${X11SRCDIR.xorg-server}/render \
|
||||
-I${DESTDIR}${X11INCDIR}/X11/extensions \
|
||||
-I${XSERVERINCDIR}
|
||||
|
||||
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
LIBDIR= ${XMODULEDIR}
|
||||
.include <bsd.lib.mk>
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
|
||||
|
||||
XMODULEDIR= ${X11USRLIBDIR}/modules
|
||||
|
||||
.include "../../../Makefile.serverlib"
|
||||
.include "../../../Makefile.servermod"
|
||||
|
||||
LIB= vbe
|
||||
|
||||
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
|
||||
SRCS= vbe.c vbeModes.c vbe_module.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
|
||||
-I${X11SRCDIR.xorg-server}/mi \
|
||||
-I${X11SRCDIR.xorg-server}/include \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${DESTDIR}${X11INCDIR}/xorg \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
|
||||
-I${XSERVERINCDIR}
|
||||
|
||||
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
|
||||
|
||||
# XXX
|
||||
COPTS.vbe.c= -Wno-error
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
LIBDIR= ${XMODULEDIR}
|
||||
.include <bsd.lib.mk>
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
|
||||
|
||||
XMODULEDIR= ${X11USRLIBDIR}/modules
|
||||
|
||||
.include "../../../Makefile.serverlib"
|
||||
.include "../../../Makefile.servermod"
|
||||
|
||||
LIB= vgahw
|
||||
|
||||
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
|
||||
SRCS= vgaHW.c vgaHWmodule.c
|
||||
|
||||
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}/Xext \
|
||||
-I${X11SRCDIR.xorg-server}/cfb \
|
||||
-I${X11SRCDIR.xorg-server}/mfb \
|
||||
-I${X11SRCDIR.xorg-server}/mi \
|
||||
-I${X11SRCDIR.xorg-server}/include \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${DESTDIR}${X11INCDIR}/xorg \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
|
||||
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
|
||||
-I${XSERVERINCDIR}
|
||||
|
||||
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
LIBDIR= ${XMODULEDIR}
|
||||
.include <bsd.lib.mk>
|
||||
|
|
@ -0,0 +1,78 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
|
||||
|
||||
XMODULEDIR= ${X11USRLIBDIR}/modules
|
||||
|
||||
.include "../../../Makefile.serverlib"
|
||||
.include "../../../Makefile.servermod"
|
||||
|
||||
LIB= xaa
|
||||
|
||||
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
|
||||
|
||||
SRCS= xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \
|
||||
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 \
|
||||
xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c \
|
||||
xaaLine.c xaaDashLine.c xaaOverlay.c xaaOffscreen.c \
|
||||
xaaOverlayDF.c xaaStateChange.c xaaPict.c
|
||||
|
||||
SRCS+= l-xaaBitmap.c l-xaaStipple.c l-xaaTEGlyph.c \
|
||||
l3-xaaBitmap.c l3-xaaStipple.c \
|
||||
m-xaaBitmap.c m-xaaStipple.c m-xaaTEGlyph.c \
|
||||
m3-xaaBitmap.c m3-xaaStipple.c \
|
||||
lf-xaaBitmap.c lf-xaaStipple.c lf-xaaTEGlyph.c \
|
||||
lf3-xaaBitmap.c lf3-xaaStipple.c \
|
||||
mf-xaaBitmap.c mf-xaaStipple.c mf-xaaTEGlyph.c \
|
||||
mf3-xaaBitmap.c mf3-xaaStipple.c \
|
||||
s-xaaLine.c s-xaaDashLine.c \
|
||||
|
||||
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/X11/extensions \
|
||||
-I${DESTDIR}${X11INCDIR}/xorg \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${X11SRCDIR.xorg-server}/Xext \
|
||||
-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}/include \
|
||||
-I${X11SRCDIR.xorg-server}/include/extensions \
|
||||
-I${X11SRCDIR.xorg-server}/mi \
|
||||
-I${X11SRCDIR.xorg-server}/render \
|
||||
-I${XSERVERINCDIR}
|
||||
|
||||
# XXX to find files lokoing for "../../../../hw/something"
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
|
||||
|
||||
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT} \
|
||||
${X11FLAGS.DIX}
|
||||
|
||||
.if 0
|
||||
CPPFLAGS.lsb_fixed_xaaBitmap.c= -DLSBFIRST -DFIXEDBASE
|
||||
CPPFLAGS.lsb_fixed_xaaBitmap3.c= -DLSBFIRST -DFIXEDBASE -DTRIPLE_BITS
|
||||
CPPFLAGS.lsb_fixed_xaaStipple.c= -DLSBFIRST -DFIXEDBASE
|
||||
CPPFLAGS.lsb_fixed_xaaStipple3.c= -DLSBFIRST -DFIXEDBASE -DTRIPLE_BITS
|
||||
CPPFLAGS.lsb_fixed_xaaTEGlyph.c= -DLSBFIRST -DFIXEDBASE
|
||||
CPPFLAGS.lsb_xaaBitmap.c= -DLSBFIRST
|
||||
CPPFLAGS.lsb_xaaBitmap3.c= -DLSBFIRST -DTRIPLE_BITS
|
||||
CPPFLAGS.lsb_xaaStipple.c= -DLSBFIRST
|
||||
CPPFLAGS.lsb_xaaStipple3.c= -DLSBFIRST -DTRIPLE_BITS
|
||||
CPPFLAGS.lsb_xaaTEGlyph.c= -DLSBFIRST
|
||||
CPPFLAGS.msb_fixed_xaaBitmap.c= -DMSBFIRST -DFIXEDBASE
|
||||
CPPFLAGS.msb_fixed_xaaBitmap3.c= -DMSBFIRST -DFIXEDBASE -DTRIPLE_BITS
|
||||
CPPFLAGS.msb_fixed_xaaStipple.c= -DMSBFIRST -DFIXEDBASE
|
||||
CPPFLAGS.msb_fixed_xaaStipple3.c= -DMSBFIRST -DFIXEDBASE -DTRIPLE_BITS
|
||||
CPPFLAGS.msb_fixed_xaaTEGlyph.c= -DMSBFIRST -DFIXEDBASE
|
||||
CPPFLAGS.msb_xaaBitmap.c= -DMSBFIRST
|
||||
CPPFLAGS.msb_xaaBitmap3.c= -DMSBFIRST -DTRIPLE_BITS
|
||||
CPPFLAGS.msb_xaaStipple.c= -DMSBFIRST
|
||||
CPPFLAGS.msb_xaaStipple3.c= -DMSBFIRST -DTRIPLE_BITS
|
||||
CPPFLAGS.msb_xaaTEGlyph.c= -DMSBFIRST
|
||||
CPPFLAGS.xaaSeg.c= -DPOLYSEGMENT
|
||||
CPPFLAGS.xaaDashSeg.c= -DPOLYSEGMENT
|
||||
.endif
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
LIBDIR= ${XMODULEDIR}
|
||||
.include <bsd.lib.mk>
|
||||
Loading…
Reference in New Issue