Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 133 insertions, 0 deletions

diff --git a/xorg-server/mfb/Makefile.am b/xorg-server/mfb/Makefile.am
new file mode 100644
index 000000000..274a32d7d
--- /dev/null
+++ b/xorg-server/mfb/Makefile.am
@@ -0,0 +1,133 @@
+noinst_LTLIBRARIES = libmfb.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
+
+libmfb_gen_sources = mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \
+	 mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \
+	 mfbteblack.c mfbbltC.c mfbbltX.c mfbbltCI.c mfbbltO.c mfbbltG.c \
+	 mfbtileC.c mfbtileG.c mfbplywhite.c mfbplyblack.c mfbplyinv.c
+
+DISTCLEANFILES = $(libmfb_gen_sources)
+
+libmfb_la_SOURCES = mfbgc.c mfbwindow.c mfbfont.c \
+	 mfbfillrct.c maskbits.c mfbpixmap.c \
+	 mfbimage.c mfbline.c mfbbres.c mfbhrzvert.c mfbbresd.c \
+	 mfbpushpxl.c mfbzerarc.c mfbfillarc.c \
+         mfbfillsp.c mfbsetsp.c mfbscrinit.c mfbscrclse.c mfbclip.c \
+         mfbbitblt.c mfbgetsp.c mfbpolypnt.c \
+	 mfbcmap.c mfbmisc.c $(libmfb_gen_sources)
+
+EXTRA_DIST = maskbits.h mergerop.h fastblt.h mfbline.c mfbblt.c mfbtile.c \
+             mfbplygblt.c mfbimggblt.c mfbpntarea.c mfbtegblt.c mfbply1rct.c
+
+sdk_HEADERS = mfb.h
+
+mfbseg.c:
+	echo "#define POLYSEGMENT" > $@
+	echo "#include \"$(srcdir)/mfbline.c\"" >> $@
+
+mfbbltC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"$(srcdir)/mfbblt.c\"" >> $@
+
+mfbbltX.c:
+	echo "#define MROP Mxor" > $@
+	echo "#include \"$(srcdir)/mfbblt.c\"" >> $@
+
+mfbbltCI.c:
+	echo "#define MROP McopyInverted" > $@
+	echo "#include \"$(srcdir)/mfbblt.c\"" >> $@
+
+mfbbltO.c:
+	echo "#define MROP Mor" > $@
+	echo "#include \"$(srcdir)/mfbblt.c\"" >> $@
+
+mfbbltG.c:
+	echo "#define MROP 0" > $@
+	echo "#include \"$(srcdir)/mfbblt.c\"" >> $@
+
+mfbtileC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"$(srcdir)/mfbtile.c\"" >> $@
+
+mfbtileG.c:
+	echo "#define MROP 0" > $@
+	echo "#include \"$(srcdir)/mfbtile.c\"" >> $@
+
+mfbpgbwht.c:
+	echo "#define OPEQ MFB_OPEQ_WHITE" > $@
+	echo "#define MFBPOLYGLYPHBLT mfbPolyGlyphBltWhite" >> $@
+	echo "#include \"$(srcdir)/mfbplygblt.c\"" >> $@
+
+mfbpgbblak.c:
+	echo "#define OPEQ MFB_OPEQ_BLACK" > $@
+	echo "#define MFBPOLYGLYPHBLT mfbPolyGlyphBltBlack" >> $@
+	echo "#include \"$(srcdir)/mfbplygblt.c\"" >> $@
+
+mfbpgbinv.c:
+	echo "#define OPEQ MFB_OPEQ_INVERT" > $@
+	echo "#define MFBPOLYGLYPHBLT mfbPolyGlyphBltInvert" >> $@
+	echo "#include \"$(srcdir)/mfbplygblt.c\"" >> $@
+
+mfbigbwht.c:
+	echo "#define OPEQ MFB_OPEQ_WHITE" > $@
+	echo "#define MFBIMAGEGLYPHBLT mfbImageGlyphBltWhite" >> $@
+	echo "#include \"$(srcdir)/mfbimggblt.c\"" >> $@
+
+mfbigbblak.c:
+	echo "#define OPEQ MFB_OPEQ_BLACK" > $@
+	echo "#define MFBIMAGEGLYPHBLT mfbImageGlyphBltBlack" >> $@
+	echo "#include \"$(srcdir)/mfbimggblt.c\"" >> $@
+
+mfbpawhite.c:
+	echo "#define OPEQ MFB_OPEQ_WHITE" > $@
+	echo "#define MFBSOLIDFILLAREA mfbSolidWhiteArea" >> $@
+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_WHITE" >> $@
+	echo "#define MFBSTIPPLEFILLAREA mfbStippleWhiteArea" >> $@
+	echo "#include \"$(srcdir)/mfbpntarea.c\"" >> $@
+
+mfbpablack.c:
+	echo "#define OPEQ MFB_OPEQ_BLACK" > $@
+	echo "#define MFBSOLIDFILLAREA mfbSolidBlackArea" >> $@
+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_BLACK" >> $@
+	echo "#define MFBSTIPPLEFILLAREA mfbStippleBlackArea" >> $@
+	echo "#include \"$(srcdir)/mfbpntarea.c\"" >> $@
+
+mfbpainv.c:
+	echo "#define OPEQ MFB_OPEQ_INVERT" > $@
+	echo "#define MFBSOLIDFILLAREA mfbSolidInvertArea" >> $@
+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_INVERT" >> $@
+	echo "#define MFBSTIPPLEFILLAREA mfbStippleInvertArea" >> $@
+	echo "#include \"$(srcdir)/mfbpntarea.c\"" >> $@
+
+mfbtewhite.c:
+	echo "#define OP MFB_OP_WHITE" > $@
+	echo "#define MFBTEGLYPHBLT mfbTEGlyphBltWhite" >> $@
+	echo "#define CLIPTETEXT mfbImageGlyphBltWhite" >> $@
+	echo "#include \"$(srcdir)/mfbtegblt.c\"" >> $@
+
+mfbteblack.c:
+	echo "#define OP MFB_OP_BLACK" > $@
+	echo "#define MFBTEGLYPHBLT mfbTEGlyphBltBlack" >> $@
+	echo "#define CLIPTETEXT mfbImageGlyphBltBlack" >> $@
+	echo "#include \"$(srcdir)/mfbtegblt.c\"" >> $@
+
+mfbplywhite.c:
+	echo "#define OPEQ MFB_OPEQ_WHITE" > $@
+	echo "#define MFBFILLPOLY1RECT mfbFillPolyWhite" >> $@
+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_WHITE" >> $@
+	echo "#include \"$(srcdir)/mfbply1rct.c\"" >> $@
+
+mfbplyblack.c:
+	echo "#define OPEQ MFB_OPEQ_BLACK" > $@
+	echo "#define MFBFILLPOLY1RECT mfbFillPolyBlack" >> $@
+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_BLACK" >> $@
+	echo "#include \"$(srcdir)/mfbply1rct.c\"" >> $@
+
+mfbplyinv.c:
+	echo "#define OPEQ MFB_OPEQ_INVERT" > $@
+	echo "#define MFBFILLPOLY1RECT mfbFillPolyInvert" >> $@
+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_INVERT" >> $@
+	echo "#include \"$(srcdir)/mfbply1rct.c\"" >> $@