add xorg-server build support for XTrap, cfb, cfb32, damageext,
record and xfixes.
This commit is contained in:
mrg
parent
4e68f45f9b
commit
edf20c220e
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.7 2008/08/02 20:41:29 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ SUBDIR.miext=
|
|||
.endif
|
||||
|
||||
.if ${XSERVER_HAS_CFB} != "no"
|
||||
SUBDIR.cfb=cfb cfb16 cfb24 cfb32
|
||||
SUBDIR.cfb=cfb cfb32
|
||||
.else
|
||||
SUBDIR.cfb=
|
||||
.endif
|
||||
|
|
@ -50,8 +50,9 @@ SUBDIR+= damageext XTrap composite exa config hw
|
|||
### this is the current working set
|
||||
SUBDIR= doc include .WAIT
|
||||
SUBDIR+= dix ${SUBDIR.fb} mi Xext ${SUBDIR.miext} os randr render
|
||||
SUBDIR+= Xi xkb dbe mfb
|
||||
#SUBDIR+= ${SUBDIR.afb} {SUBDIR.cfb} record xfixes
|
||||
# XXX need to test afb yet
|
||||
SUBDIR+= Xi xkb dbe mfb ${SUBDIR.afb} {SUBDIR.cfb} record xfixes
|
||||
SUBDIR+= damageext XTrap
|
||||
#SUBDIR+= damageext XTrap composite exa config hw
|
||||
.endif
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
.include "../Makefile.serverlib"
|
||||
|
||||
.if ${MKX11LOADABLE} != "no"
|
||||
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
|
||||
SRCS= xf86XTrapModule.c
|
||||
CPPFLAGS+= -DEXTMODULE
|
||||
.endif
|
||||
|
||||
.include "../Makefile.servermod"
|
||||
.include "Makefile.xtrap"
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
# $NetBSD: Makefile.xtrap,v 1.1 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
LIB= xtrap
|
||||
|
||||
.PATH: ${X11SRCDIR.xorg-server}/XTrap
|
||||
SRCS+= xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
|
||||
-I${XSERVERINCDIR} \
|
||||
-I${DESTDIR}${X11INCDIR}/X11/extensions \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${X11SRCDIR.xorg-server}/Xext
|
||||
|
||||
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
|
||||
|
||||
# XXX
|
||||
COPTS.xtrapdi.c= -Wno-error
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
LIBDIR= ${XMODULEDIR}
|
||||
.include <bsd.lib.mk>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
.include "../Makefile.serverlib"
|
||||
|
||||
PIXELSIZE= 8
|
||||
|
||||
.if ${MKX11LOADABLE} != "no"
|
||||
XMODULEDIR= ${X11USRLIBDIR}/modules
|
||||
SRCS= cfbmodule.c
|
||||
.endif
|
||||
|
||||
.include "../Makefile.servermod"
|
||||
.include "Makefile.cfb"
|
||||
|
|
@ -0,0 +1,131 @@
|
|||
# $NetBSD: Makefile.cfb,v 1.1 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
.if ${PIXELSIZE} == 8
|
||||
LIB= cfb
|
||||
.else
|
||||
LIB= cfb${PIXELSIZE}
|
||||
.endif
|
||||
|
||||
.PATH: ${X11SRCDIR.xorg-server}/cfb
|
||||
SRCS+= cfbseg.c cfbfillarcC.c cfbfillarcG.c cfbzerarcC.c \
|
||||
cfbzerarcX.c cfbzerarcG.c cfbbltC.c cfbbltX.c \
|
||||
cfbbltO.c cfbbltG.c cfbsolidC.c cfbsolidX.c \
|
||||
cfbsolidG.c cfbtileoddC.c cfbtileoddG.c cfbtile32C.c \
|
||||
cfbtile32G.c cfb8lineCO.c cfb8lineCP.c cfb8lineX.c \
|
||||
cfb8lineG.c cfb8segCS.c cfb8segC.c cfb8segX.c \
|
||||
cfb8setG.c cfbply1rctC.c cfbply1rctG.c
|
||||
|
||||
SRCS+= cfbgc.c cfbrrop.c cfbwindow.c cfbpntwin.c \
|
||||
cfbmskbits.c cfbpixmap.c cfbbitblt.c cfbfillsp.c \
|
||||
cfbsetsp.c cfbscrinit.c cfballpriv.c cfbgetsp.c \
|
||||
cfbfillrct.c cfbigblt8.c cfbglblt8.c cfbtegblt.c \
|
||||
cfbbstore.c cfbpolypnt.c cfbbres.c cfbline.c \
|
||||
cfbhrzvert.c cfbbresd.c cfbimage.c cfbcppl.c \
|
||||
cfbcmap.c
|
||||
|
||||
X11XSERVERDIR= ${X11SRCDIR.xorg-server}
|
||||
|
||||
.if 0
|
||||
BUILDSYMLINKS= cfbline.c cfbseg.c \
|
||||
cfbfillarc.c cfbfillarcC.c \
|
||||
cfbfillarc.c cfbfillarcG.c \
|
||||
cfbzerarc.c cfbzerarcC.c \
|
||||
cfbzerarc.c cfbzerarcX.c \
|
||||
cfbzerarc.c cfbzerarcG.c \
|
||||
cfbblt.c cfbbltC.c \
|
||||
cfbblt.c cfbbltX.c \
|
||||
cfbblt.c cfbbltO.c \
|
||||
cfbblt.c cfbbltG.c \
|
||||
cfbsolid.c cfbsolidC.c \
|
||||
cfbsolid.c cfbsolidX.c \
|
||||
cfbsolid.c cfbsolidG.c \
|
||||
cfbtileodd.c cfbtileoddC.c \
|
||||
cfbtileodd.c cfbtileoddG.c \
|
||||
cfbtile32.c cfbtile32C.c \
|
||||
cfbtile32.c cfbtile32G.c \
|
||||
cfb8line.c cfb8lineCO.c \
|
||||
cfb8line.c cfb8lineCP.c \
|
||||
cfb8line.c cfb8lineX.c \
|
||||
cfb8line.c cfb8lineG.c \
|
||||
cfb8line.c cfb8segCS.c \
|
||||
cfb8line.c cfb8segC.c \
|
||||
cfb8line.c cfb8segX.c \
|
||||
cfb8line.c cfb8segG.c \
|
||||
cfbply1rct.c cfbply1rctC.c \
|
||||
cfbply1rct.c cfbply1rctG.c \
|
||||
${X11XSERVERDIR}/cfb32/cfbmodule.c cfbmodule32.c
|
||||
.endif
|
||||
|
||||
|
||||
.if ${PIXELSIZE} == 8 # {
|
||||
SRCS+= cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c
|
||||
.if 0
|
||||
BUILDSYMLINKS+= cfbglblt8.c cfbglrop8.c
|
||||
.endif
|
||||
.endif # }
|
||||
|
||||
.include "../Makefile.common"
|
||||
|
||||
.if ${XSERVER_XAMIGA} != "no"
|
||||
CPPFLAGS+= -DFORCE_SEPARATE_PRIVATE
|
||||
.endif
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/cfb \
|
||||
-I${X11SRCDIR.xorg-server}/mfb \
|
||||
-I${X11SRCDIR.xorg-server}/mi \
|
||||
-I${X11SRCDIR.xorg-server}/include \
|
||||
-I${XSERVERINCDIR} \
|
||||
-I${DESTDIR}${X11INCDIR}/xorg \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${X11SRCDIR.xorg-server}/Xext
|
||||
|
||||
# XXX some path so that "../../mfb/mfbblt.c" works
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86
|
||||
|
||||
CPPFLAGS+= -DPSZ=${PIXELSIZE} -DXFREE86 \
|
||||
-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
|
||||
|
||||
|
||||
.if ${MACHINE} == "sparc64"
|
||||
CPPFLAGS+= -UXF86VIDMODE
|
||||
.endif
|
||||
|
||||
.if 0
|
||||
CPPFLAGS.cfb8lineCO.c= -DRROP=GXcopy
|
||||
CPPFLAGS.cfb8lineCP.c= -DRROP=GXcopy -DPREVIOUS
|
||||
CPPFLAGS.cfb8lineG.c= -DRROP=GXset
|
||||
CPPFLAGS.cfb8lineX.c= -DRROP=GXxor
|
||||
CPPFLAGS.cfb8segC.c= -DRROP=GXcopy -DPOLYSEGMENT
|
||||
CPPFLAGS.cfb8segCS.c= -DRROP=GXcopy -DPOLYSEGMENT -DWIDTH_SHIFT
|
||||
CPPFLAGS.cfb8segG.c= -DRROP=GXset -DPOLYSEGMENT
|
||||
CPPFLAGS.cfb8segX.c= -DRROP=GXxor -DPOLYSEGMENT
|
||||
CPPFLAGS.cfbbltC.c= -DMROP=Mcopy
|
||||
CPPFLAGS.cfbbltG.c= -DMROP=0
|
||||
CPPFLAGS.cfbbltO.c= -DMROP=Mor
|
||||
CPPFLAGS.cfbbltX.c= -DMROP=Mxor
|
||||
CPPFLAGS.cfbcmap.c= ${X11FLAGS.EXTENSION} -DGLXEXT -DGLX_USE_MESA
|
||||
CPPFLAGS.cfbfillarcC.c= -DRROP=GXcopy
|
||||
CPPFLAGS.cfbfillarcG.c= -DRROP=GXset
|
||||
CPPFLAGS.cfbglrop8.c= -DGLYPHROP
|
||||
CPPFLAGS.cfbply1rctC.c= -DRROP=GXcopy
|
||||
CPPFLAGS.cfbply1rctG.c= -DRROP=GXset
|
||||
CPPFLAGS.cfbseg.c= -DPOLYSEGMENT
|
||||
CPPFLAGS.cfbsolidC.c= -DRROP=GXcopy
|
||||
CPPFLAGS.cfbsolidG.c= -DRROP=GXset
|
||||
CPPFLAGS.cfbsolidX.c= -DRROP=GXxor
|
||||
CPPFLAGS.cfbtile32C.c= -DMROP=Mcopy
|
||||
CPPFLAGS.cfbtile32G.c= -DMROP=0
|
||||
CPPFLAGS.cfbtileoddC.c= -DMROP=Mcopy
|
||||
CPPFLAGS.cfbtileoddG.c= -DMROP=0
|
||||
CPPFLAGS.cfbzerarcC.c= -DRROP=GXcopy
|
||||
CPPFLAGS.cfbzerarcG.c= -DRROP=GXset
|
||||
CPPFLAGS.cfbzerarcX.c= -DRROP=GXxor
|
||||
.endif
|
||||
|
||||
# XXX
|
||||
COPTS.cfbgc.c= -Wno-error
|
||||
COPTS.cfbscrinit.c= -Wno-error
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
LIBDIR= ${XMODULEDIR}
|
||||
.include <bsd.lib.mk>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
.include "../Makefile.serverlib"
|
||||
|
||||
PIXELSIZE= 32
|
||||
|
||||
.if ${MKX11LOADABLE} != "no"
|
||||
XMODULEDIR= ${X11USRLIBDIR}/modules
|
||||
SRCS= cfbmodule32.c
|
||||
.endif
|
||||
|
||||
.include "../Makefile.servermod"
|
||||
.include "../cfb/Makefile.cfb"
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
.include "../Makefile.serverlib"
|
||||
.include "../Makefile.servermod"
|
||||
|
||||
LIB= damageext
|
||||
.PATH: ${X11SRCDIR.xorg-server}/damageext
|
||||
|
||||
SRCS= damageext.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
|
||||
-I${X11SRCDIR.xorg-server}/Xext \
|
||||
-I${X11SRCDIR.xorg-server}/xfixes \
|
||||
-I${X11SRCDIR.xorg-server}/damagext \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/xorg \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${X11SRCDIR.xorg-server}/../include
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
.include "../Makefile.serverlib"
|
||||
|
||||
.if ${MKX11LOADABLE} != "no"
|
||||
XMODULEDIR= ${X11ROOTDIR}/lib/modules/extensions
|
||||
SRCS= recordmod.c
|
||||
.endif
|
||||
|
||||
.include "../Makefile.servermod"
|
||||
.include "Makefile.record"
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
# $NetBSD: Makefile.record,v 1.1 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
LIB= record
|
||||
|
||||
.PATH: ${X11SRCDIR.xorg-server}/${LIB}
|
||||
SRCS+= record.c set.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${X11SRCDIR.xorg-server}/Xext
|
||||
|
||||
CPPFLAGS+= -DNDEBUG -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
|
||||
|
||||
# XXX
|
||||
COPTS.record.c= -Wno-error
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
LIBDIR= ${XMODULEDIR}
|
||||
.include <bsd.lib.mk>
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
|
||||
|
||||
.include "../Makefile.serverlib"
|
||||
.include "../Makefile.servermod"
|
||||
|
||||
LIB= xfixes
|
||||
|
||||
.PATH: ${X11SRCDIR.xorg-server}/xfixes
|
||||
SRCS= cursor.c region.c saveset.c select.c xfixes.c
|
||||
|
||||
CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION} ${X11FLAGS.DIX}
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
|
||||
-I${X11SRCDIR.xorg-server}/Xext \
|
||||
-I${X11SRCDIR.xorg-server}/fixes \
|
||||
-I${X11SRCDIR.xorg-server}/render \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/pixman-1 \
|
||||
-I${X11SRCDIR.xorg-server}/../include
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
Loading…
Reference in New Issue