Merge branch 'master' of git+ssh://spyderous@people.freedesktop.org/~spyderous/public_html/overlay

Conflicts:

	x11-base/xorg-server/Manifest
	x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild

3 files changed, 262 insertions, 0 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 67cda4a..961f30d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -7,6 +7,12 @@ SHA256 faa62e2cb5cfafabbaef42d3ecac42d4139684b321b31f597b4d6f3b62fcb1a1 files/ai
 MD5 573c1cb18905c1d9339a9a84bd9779d8 files/digest-xorg-server-9999 247
 RMD160 2d14f708463f76c30291f3950a6448c1227fbaf4 files/digest-xorg-server-9999 247
 SHA256 097fd81c0c397325418ce66f42aa19a137843d8953e4ac9265bc4f90cf2f2ab7 files/digest-xorg-server-9999 247
+MD5 fb7fc524e87b10dd3cb506c3398741cf files/xorg-server-1.0.2-Xprt-build.patch 7747
+RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 files/xorg-server-1.0.2-Xprt-build.patch 7747
+SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73 files/xorg-server-1.0.2-Xprt-build.patch 7747
+MD5 5106c724275e86950e5f4c88913198a1 files/xorg-server-1.0.2-xprint-init.patch 417
+RMD160 e29f58581c421724adf09f1df3e991092f89a017 files/xorg-server-1.0.2-xprint-init.patch 417
+SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 files/xorg-server-1.0.2-xprint-init.patch 417
 MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-9999-Sbus.patch 2388
 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-9999-Sbus.patch 2388
 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-9999-Sbus.patch 2388
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch
new file mode 100644
index 0000000..85f9db0
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch
@@ -0,0 +1,241 @@
+Index: configure.ac
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
+retrieving revision 1.157
+diff -u -r1.157 configure.ac
+--- configure.ac	30 Dec 2005 12:05:47 -0000	1.157
++++ configure.ac	6 Jan 2006 16:05:21 -0000
+@@ -1632,6 +1632,7 @@
+ Xprint/Makefile
+ Xprint/doc/Makefile
+ Xprint/pcl/Makefile
++Xprint/pcl-mono/Makefile
+ Xprint/raster/Makefile
+ Xprint/ps/Makefile
+ Xprint/etc/Makefile
+Index: Xprint/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
+retrieving revision 1.6
+diff -u -r1.6 Makefile.am
+--- Xprint/Makefile.am	2 Dec 2005 06:02:38 -0000	1.6
++++ Xprint/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -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)/lib/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\"" >> $@
+Index: Xprint/ddxInit.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/Xprint/ddxInit.c,v
+retrieving revision 1.7
+diff -u -r1.7 ddxInit.c
+--- Xprint/ddxInit.c	3 Jul 2005 07:01:09 -0000	1.7
++++ Xprint/ddxInit.c	6 Jan 2006 16:05:22 -0000
+@@ -85,6 +85,11 @@
+ 
+     pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */
+     screenInfo.numVideoScreens = 0;
++    
++#ifdef PRINT_ONLY_SERVER
++    PrinterInitOutput(pScreenInfo, argc, argv);
++#endif
++
+ }
+ 
+ static void
+Index: Xprint/pcl/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/Xprint/pcl/Makefile.am,v
+retrieving revision 1.3
+diff -u -r1.3 Makefile.am
+--- Xprint/pcl/Makefile.am	2 Dec 2005 06:02:38 -0000	1.3
++++ Xprint/pcl/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -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
+Index: cfb/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am,v
+retrieving revision 1.7
+diff -u -r1.7 Makefile.am
+--- cfb/Makefile.am	2 Dec 2005 06:02:39 -0000	1.7
++++ cfb/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -9,7 +9,7 @@
+ 
+ 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
+ 
+Index: cfb/Makefile.am.inc
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am.inc,v
+retrieving revision 1.2
+diff -u -r1.2 Makefile.am.inc
+--- cfb/Makefile.am.inc	21 Sep 2005 00:24:10 -0000	1.2
++++ cfb/Makefile.am.inc	6 Jan 2006 16:05:22 -0000
+@@ -138,3 +138,16 @@
+ cfbglrop8.c:
+ 	echo "#define GLYPHROP" > $@
+ 	echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
++
++
++if XPRINT
++
++PLATFORMDEFS = -DXFREE86
++
++cfb8bit.c:   compiler.h
++
++compiler.h:
++	echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
++
++endif
++
+Index: cfb16/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb16/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- cfb16/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
++++ cfb16/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -6,4 +6,4 @@
+ 
+ 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@
+Index: cfb24/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb24/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- cfb24/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
++++ cfb24/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -6,6 +6,6 @@
+ 
+ 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
+Index: cfb32/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb32/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- cfb32/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
++++ cfb32/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -6,4 +6,4 @@
+ 
+ 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@
+Index: mi/miinitext.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/mi/miinitext.c,v
+retrieving revision 1.28
+diff -u -r1.28 miinitext.c
+--- mi/miinitext.c	29 Dec 2005 00:19:33 -0000	1.28
++++ mi/miinitext.c	6 Jan 2006 16:05:27 -0000
+@@ -250,7 +250,7 @@
+ #include <X11/extensions/lbxstr.h>
+ #endif
+ #ifdef XPRINT
+-#include "Print.h"
++#include <X11/extensions/Print.h>
+ #endif
+ #ifdef XAPPGROUP
+ #define _XAG_SERVER_
+--- Xprint/pcl-mono/Makefile.am	2006/04/13 22:11:44	1.1
++++ Xprint/pcl-mono/Makefile.am	2006/04/13 22:11:49
+@@ -0,0 +1,5 @@
++noinst_LTLIBRARIES = libpcl.la
++
++PCL_DRIVER = -DXP_PCL_MONO
++
++include ../pcl/Makefile.am.inc
+--- Xprint/pcl/Makefile.am.inc	2006/04/13 22:11:44     1.1
++++ Xprint/pcl/Makefile.am.inc	2006/04/13 22:11:49
+@@ -0,0 +1,29 @@
++INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
++ 
++AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
++	-D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER)
++ 
++libpcl_la_SOURCES =		\
++	$(srcdir)/../pcl/PclArc.c	\
++	$(srcdir)/../pcl/PclArea.c	\
++	$(srcdir)/../pcl/PclAttr.c	\
++	$(srcdir)/../pcl/PclAttVal.c	\
++	$(srcdir)/../pcl/PclColor.c	\
++	$(srcdir)/../pcl/PclCursor.c	\
++	$(srcdir)/../pcl/PclDef.h	\
++	$(srcdir)/../pcl/PclFonts.c	\
++	$(srcdir)/../pcl/PclGC.c	\
++	$(srcdir)/../pcl/Pcl.h		\
++	$(srcdir)/../pcl/PclInit.c	\
++	$(srcdir)/../pcl/PclLine.c	\
++	$(srcdir)/../pcl/Pclmap.h	\
++	$(srcdir)/../pcl/PclMisc.c	\
++	$(srcdir)/../pcl/PclPixel.c	\
++	$(srcdir)/../pcl/PclPixmap.c	\
++	$(srcdir)/../pcl/PclPolygon.c	\
++	$(srcdir)/../pcl/PclPrint.c	\
++	$(srcdir)/../pcl/PclSFonts.c	\
++	$(srcdir)/../pcl/PclSFonts.h	\
++	$(srcdir)/../pcl/PclSpans.c	\
++	$(srcdir)/../pcl/PclText.c	\
++	$(srcdir)/../pcl/PclWindow.c
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch
new file mode 100644
index 0000000..a4783ab
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch
@@ -0,0 +1,15 @@
+--- Xprint/etc/init.d/Makefile.am	2006/04/14 04:47:28	1.1
++++ Xprint/etc/init.d/Makefile.am	2006/04/14 05:26:42
+@@ -1 +1,12 @@
++include $(top_srcdir)/cpprules.in
++
++noinst_PRE = xprint
++BUILT_SOURCES = $(noinst_PRE)
++CLEANFILES = $(noinst_PRE) xprint.pre
++
++CPP_FILES_FLAGS = -DProjectRoot='"$(PROJECTROOT)"' -DOS_LINUX
++
++xprint.pre: xprint.cpp
++	$(SED) -e 's/^\(\s\+\)#/\1XCOMM/' $< > $@
++
+ EXTRA_DIST = xprint.cpp