/[gentoo-x86]/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch
Gentoo

Contents of /x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (hide annotations) (download)
Wed Jan 24 06:34:22 2007 UTC (11 years, 8 months ago) by dberkholz
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Stop supporting Xorg 7.0.
(Portage version: 2.1.2)
 (Unsigned Manifest commit)

1 spyderous 1.1 Index: configure.ac
2     ===================================================================
3     RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
4     retrieving revision 1.157
5     diff -u -r1.157 configure.ac
6     --- configure.ac 30 Dec 2005 12:05:47 -0000 1.157
7     +++ configure.ac 6 Jan 2006 16:05:21 -0000
8     @@ -1632,6 +1632,7 @@
9     Xprint/Makefile
10     Xprint/doc/Makefile
11     Xprint/pcl/Makefile
12     +Xprint/pcl-mono/Makefile
13     Xprint/raster/Makefile
14     Xprint/ps/Makefile
15     Xprint/etc/Makefile
16     Index: Xprint/Makefile.am
17     ===================================================================
18     RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
19     retrieving revision 1.6
20     diff -u -r1.6 Makefile.am
21     --- Xprint/Makefile.am 2 Dec 2005 06:02:38 -0000 1.6
22     +++ Xprint/Makefile.am 6 Jan 2006 16:05:22 -0000
23     @@ -1,13 +1,17 @@
24     -SUBDIRS = doc pcl raster ps etc
25     +SUBDIRS = doc pcl pcl-mono raster ps etc
26    
27     bin_PROGRAMS = Xprt
28    
29     Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
30     - -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \
31     - -DXPRINTDIR=\"$(prefix)/X11/xserver\"
32     + -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \
33     + -DXPRINTDIR=\"$(prefix)/lib/X11/xserver\" \
34     + -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
35    
36     Xprt_LDFLAGS = -L$(top_srcdir)
37     -Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
38     +Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \
39     + pcl/libpcl.la pcl-mono/libpcl.la \
40     + ../mfb/libmfb.la ../mi/libmi.la \
41     + ../cfb32/libcfb32.la ../cfb/libcfb.la ../Xext/libXext.la
42    
43     miinitext-wrapper.c:
44     echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
45     Index: Xprint/ddxInit.c
46     ===================================================================
47     RCS file: /cvs/xorg/xserver/xorg/Xprint/ddxInit.c,v
48     retrieving revision 1.7
49     diff -u -r1.7 ddxInit.c
50     --- Xprint/ddxInit.c 3 Jul 2005 07:01:09 -0000 1.7
51     +++ Xprint/ddxInit.c 6 Jan 2006 16:05:22 -0000
52     @@ -85,6 +85,11 @@
53    
54     pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */
55     screenInfo.numVideoScreens = 0;
56     +
57     +#ifdef PRINT_ONLY_SERVER
58     + PrinterInitOutput(pScreenInfo, argc, argv);
59     +#endif
60     +
61     }
62    
63     static void
64     Index: Xprint/pcl/Makefile.am
65     ===================================================================
66     RCS file: /cvs/xorg/xserver/xorg/Xprint/pcl/Makefile.am,v
67     retrieving revision 1.3
68     diff -u -r1.3 Makefile.am
69     --- Xprint/pcl/Makefile.am 2 Dec 2005 06:02:38 -0000 1.3
70     +++ Xprint/pcl/Makefile.am 6 Jan 2006 16:05:22 -0000
71     @@ -1,31 +1,6 @@
72     noinst_LTLIBRARIES = libpcl.la
73    
74     -INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
75     +PCL_DRIVER = -DXP_PCL_COLOR
76    
77     -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
78     - -D_XP_PRINT_SERVER_ -DPSZ=8
79     +include ../pcl/Makefile.am.inc
80    
81     -libpcl_la_SOURCES = \
82     - PclArc.c \
83     - PclArea.c \
84     - PclAttr.c \
85     - PclAttVal.c \
86     - PclColor.c \
87     - PclCursor.c \
88     - PclDef.h \
89     - PclFonts.c \
90     - PclGC.c \
91     - Pcl.h \
92     - PclInit.c \
93     - PclLine.c \
94     - Pclmap.h \
95     - PclMisc.c \
96     - PclPixel.c \
97     - PclPixmap.c \
98     - PclPolygon.c \
99     - PclPrint.c \
100     - PclSFonts.c \
101     - PclSFonts.h \
102     - PclSpans.c \
103     - PclText.c \
104     - PclWindow.c
105     Index: cfb/Makefile.am
106     ===================================================================
107     RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am,v
108     retrieving revision 1.7
109     diff -u -r1.7 Makefile.am
110     --- cfb/Makefile.am 2 Dec 2005 06:02:39 -0000 1.7
111     +++ cfb/Makefile.am 6 Jan 2006 16:05:22 -0000
112     @@ -9,7 +9,7 @@
113    
114     libcfb_la_LIBADD = ../mfb/libmfb.la
115    
116     -AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
117     +AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
118    
119     INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
120    
121     Index: cfb/Makefile.am.inc
122     ===================================================================
123     RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am.inc,v
124     retrieving revision 1.2
125     diff -u -r1.2 Makefile.am.inc
126     --- cfb/Makefile.am.inc 21 Sep 2005 00:24:10 -0000 1.2
127     +++ cfb/Makefile.am.inc 6 Jan 2006 16:05:22 -0000
128     @@ -138,3 +138,16 @@
129     cfbglrop8.c:
130     echo "#define GLYPHROP" > $@
131     echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
132     +
133     +
134     +if XPRINT
135     +
136     +PLATFORMDEFS = -DXFREE86
137     +
138     +cfb8bit.c: compiler.h
139     +
140     +compiler.h:
141     + echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
142     +
143     +endif
144     +
145     Index: cfb16/Makefile.am
146     ===================================================================
147     RCS file: /cvs/xorg/xserver/xorg/cfb16/Makefile.am,v
148     retrieving revision 1.4
149     diff -u -r1.4 Makefile.am
150     --- cfb16/Makefile.am 2 Dec 2005 06:02:39 -0000 1.4
151     +++ cfb16/Makefile.am 6 Jan 2006 16:05:22 -0000
152     @@ -6,4 +6,4 @@
153    
154     INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
155    
156     -AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
157     +AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
158     Index: cfb24/Makefile.am
159     ===================================================================
160     RCS file: /cvs/xorg/xserver/xorg/cfb24/Makefile.am,v
161     retrieving revision 1.4
162     diff -u -r1.4 Makefile.am
163     --- cfb24/Makefile.am 2 Dec 2005 06:02:39 -0000 1.4
164     +++ cfb24/Makefile.am 6 Jan 2006 16:05:22 -0000
165     @@ -6,6 +6,6 @@
166    
167     EXTRA_DIST = cfbrrop24.h
168    
169     -AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
170     +AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
171    
172     INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
173     Index: cfb32/Makefile.am
174     ===================================================================
175     RCS file: /cvs/xorg/xserver/xorg/cfb32/Makefile.am,v
176     retrieving revision 1.4
177     diff -u -r1.4 Makefile.am
178     --- cfb32/Makefile.am 2 Dec 2005 06:02:39 -0000 1.4
179     +++ cfb32/Makefile.am 6 Jan 2006 16:05:22 -0000
180     @@ -6,4 +6,4 @@
181    
182     INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
183    
184     -AM_CFLAGS = -DPSZ=32 @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
185     +AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
186     Index: mi/miinitext.c
187     ===================================================================
188     RCS file: /cvs/xorg/xserver/xorg/mi/miinitext.c,v
189     retrieving revision 1.28
190     diff -u -r1.28 miinitext.c
191     --- mi/miinitext.c 29 Dec 2005 00:19:33 -0000 1.28
192     +++ mi/miinitext.c 6 Jan 2006 16:05:27 -0000
193     @@ -250,7 +250,7 @@
194     #include <X11/extensions/lbxstr.h>
195     #endif
196     #ifdef XPRINT
197     -#include "Print.h"
198     +#include <X11/extensions/Print.h>
199     #endif
200     #ifdef XAPPGROUP
201     #define _XAG_SERVER_
202     --- Xprint/pcl-mono/Makefile.am 2006/04/13 22:11:44 1.1
203     +++ Xprint/pcl-mono/Makefile.am 2006/04/13 22:11:49
204     @@ -0,0 +1,5 @@
205     +noinst_LTLIBRARIES = libpcl.la
206     +
207     +PCL_DRIVER = -DXP_PCL_MONO
208     +
209     +include ../pcl/Makefile.am.inc
210     --- Xprint/pcl/Makefile.am.inc 2006/04/13 22:11:44 1.1
211     +++ Xprint/pcl/Makefile.am.inc 2006/04/13 22:11:49
212     @@ -0,0 +1,29 @@
213     +INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
214     +
215     +AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
216     + -D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER)
217     +
218     +libpcl_la_SOURCES = \
219     + $(srcdir)/../pcl/PclArc.c \
220     + $(srcdir)/../pcl/PclArea.c \
221     + $(srcdir)/../pcl/PclAttr.c \
222     + $(srcdir)/../pcl/PclAttVal.c \
223     + $(srcdir)/../pcl/PclColor.c \
224     + $(srcdir)/../pcl/PclCursor.c \
225     + $(srcdir)/../pcl/PclDef.h \
226     + $(srcdir)/../pcl/PclFonts.c \
227     + $(srcdir)/../pcl/PclGC.c \
228     + $(srcdir)/../pcl/Pcl.h \
229     + $(srcdir)/../pcl/PclInit.c \
230     + $(srcdir)/../pcl/PclLine.c \
231     + $(srcdir)/../pcl/Pclmap.h \
232     + $(srcdir)/../pcl/PclMisc.c \
233     + $(srcdir)/../pcl/PclPixel.c \
234     + $(srcdir)/../pcl/PclPixmap.c \
235     + $(srcdir)/../pcl/PclPolygon.c \
236     + $(srcdir)/../pcl/PclPrint.c \
237     + $(srcdir)/../pcl/PclSFonts.c \
238     + $(srcdir)/../pcl/PclSFonts.h \
239     + $(srcdir)/../pcl/PclSpans.c \
240     + $(srcdir)/../pcl/PclText.c \
241     + $(srcdir)/../pcl/PclWindow.c

  ViewVC Help
Powered by ViewVC 1.1.20