frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #5525: Build a working Xprt. (Drew Parsons)

This commit is contained in:
Adam Jackson 2006-01-06 23:06:15 +00:00
parent fe0c838b5d
commit 13c9e0c094
12 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -2,9 +2,23 @@
* hw/xfree86/dri/dri.c:
* hw/xfree86/dri/dristruct.h:
Move drawable lock acquisition into DRIClipNotify from DRIValidateTree, so we only take it when
clipping a DRI drawable instead of on every tree update. Note drawable lock acquisition per-
screen instead of globally, and drop it in BlockHandler if necessary.
Move drawable lock acquisition into DRIClipNotify from DRIValidateTree,
so we only take it when clipping a DRI drawable instead of on every
tree update. Note drawable lock acquisition per-screen instead of
globally, and drop it in BlockHandler if necessary.
* configure.ac:
* Xprint/Makefile.am:
* Xprint/ddxInit.c:
* Xprint/pcl/Makefile.am:
* Xprint/pcl-mono/Makefile.am:
* cfb/Makefile.am:
* cfb/Makefile.am.inc:
* cfb16/Makefile.am:
* cfb24/Makefile.am:
* cfb32/Makefile.am:
* mi/miinitext.c:
Bug #5525: Build a working Xprt. (Drew Parsons)
2006-01-06 Adam Jackson <ajax@freedesktop.org>

12
Xprint/Makefile.am
View File

@ -1,13 +1,17 @@
SUBDIRS = doc pcl raster ps etc
SUBDIRS = doc pcl pcl-mono raster ps etc
bin_PROGRAMS = Xprt
Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
-DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \
-DXPRINTDIR=\"$(prefix)/X11/xserver\"
-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \
-DXPRINTDIR=\"$(prefix)/X11/xserver\" \
-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
Xprt_LDFLAGS = -L$(top_srcdir)
Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \
pcl/libpcl.la pcl-mono/libpcl.la \
../mfb/libmfb.la ../mi/libmi.la \
../cfb32/libcfb32.la ../cfb/libcfb.la ../Xext/libXext.la
miinitext-wrapper.c:
echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@

5
Xprint/ddxInit.c
View File

@ -85,6 +85,11 @@ InitOutput(
pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */
screenInfo.numVideoScreens = 0;
#ifdef PRINT_ONLY_SERVER
PrinterInitOutput(pScreenInfo, argc, argv);
#endif
}
static void

5
Xprint/pcl-mono/Makefile.am Normal file
View File

@ -0,0 +1,5 @@
noinst_LTLIBRARIES = libpcl.la
PCL_DRIVER = -DXP_PCL_MONO
include ../pcl/Makefile.am.inc

29
Xprint/pcl/Makefile.am
View File

@ -1,31 +1,6 @@
noinst_LTLIBRARIES = libpcl.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
PCL_DRIVER = -DXP_PCL_COLOR
AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
-D_XP_PRINT_SERVER_ -DPSZ=8
include ../pcl/Makefile.am.inc
libpcl_la_SOURCES = \
PclArc.c \
PclArea.c \
PclAttr.c \
PclAttVal.c \
PclColor.c \
PclCursor.c \
PclDef.h \
PclFonts.c \
PclGC.c \
Pcl.h \
PclInit.c \
PclLine.c \
Pclmap.h \
PclMisc.c \
PclPixel.c \
PclPixmap.c \
PclPolygon.c \
PclPrint.c \
PclSFonts.c \
PclSFonts.h \
PclSpans.c \
PclText.c \
PclWindow.c

2
cfb/Makefile.am
View File

@ -9,7 +9,7 @@ libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \
libcfb_la_LIBADD = ../mfb/libmfb.la
AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support

13
cfb/Makefile.am.inc
View File

@ -138,3 +138,16 @@ cfbply1rctG.c:
cfbglrop8.c:
echo "#define GLYPHROP" > $@
echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
if XPRINT
PLATFORMDEFS = -DXFREE86
cfbmskbits.h: compiler.h
compiler.h:
echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
endif

2
cfb16/Makefile.am
View File

@ -6,4 +6,4 @@ libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

2
cfb24/Makefile.am
View File

@ -6,6 +6,6 @@ libcfb24_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
EXTRA_DIST = cfbrrop24.h
AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support

2
cfb32/Makefile.am
View File

@ -6,4 +6,4 @@ libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
AM_CFLAGS = -DPSZ=32 @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

1
configure.ac
View File

@ -1632,6 +1632,7 @@ hw/kdrive/via/Makefile
Xprint/Makefile
Xprint/doc/Makefile
Xprint/pcl/Makefile
Xprint/pcl-mono/Makefile
Xprint/raster/Makefile
Xprint/ps/Makefile
Xprint/etc/Makefile

4
mi/miinitext.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.27 2005/12/28 10:02:53 ajax Exp $ */
/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.28 2005/12/29 00:19:33 anholt Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
/***********************************************************
@ -250,7 +250,7 @@ typedef void (*InitExtension)(INITARGS);
#include <X11/extensions/lbxstr.h>
#endif
#ifdef XPRINT
#include "Print.h"
#include <X11/extensions/Print.h>
#endif
#ifdef XAPPGROUP
#define _XAG_SERVER_