--- a/open-src/driver/xf86-video-apm/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-apm/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/01/31
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -53,8 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lvgahw -lxaa \
- -lxf1bpp -lxf4bpp -lXfont
+ -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa -lxf1bpp -lxf4bpp
include ../Makefile.inc
--- a/open-src/driver/xf86-video-ast/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-ast/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# @(#)Makefile 1.5 07/07/31
#
# Package name used in tarballs
@@ -51,6 +51,6 @@
DRIVER_ADD_LIBS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lvbe -lvgahw -lxaa
+ -lfb -lint10 -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-ati/mapfiles.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-ati/mapfiles.patch Tue Jul 31 15:09:29 2007 -0700
@@ -28,7 +28,7 @@
--- src/Makefile.am 2006-10-03 07:49:13.000000000 -0700
+++ src/Makefile.am 2007-01-10 18:41:48.343028000 -0800
-@@ -195,3 +195,50 @@
+@@ -195,3 +195,47 @@
theatre.h \
theatre_reg.h \
atipciids.h
@@ -53,16 +53,13 @@
+
+atimisc_drv_la_LDFLAGS += \
+ -Wl,-M,mapfile-ati_drv-external \
-+ -lddc -lexa -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lxaa \
-+ -lxf1bpp -lxf4bpp -lXfont
++ -lexa -lfb -lint10 -lshadowfb -lvbe -lxaa -lxf1bpp -lxf4bpp
+
+r128_drv_la_LDFLAGS += \
-+ -lddc -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lvgahw -lxaa \
-+ -lfbdevhw -lXfont
++ -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa -lfbdevhw
+
+radeon_drv_la_LDFLAGS += \
-+ -lddc -lexa -li2c -lfb -lint10 -lramdac -lvbe -lvgahw -lxaa \
-+ -lfbdevhw -lm
++ -lexa -lfb -lint10 -lvbe -lvgahw -lxaa -lfbdevhw -lm
+
+mapfiles: $(MAPFILES)
+
--- a/open-src/driver/xf86-video-chips/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-chips/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/01/31
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -53,8 +53,8 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lvgahw -lxaa \
- -lxf1bpp -lxf4bpp -lxf8_16bpp -lXfont
+ -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa \
+ -lxf1bpp -lxf4bpp -lxf8_16bpp
include ../Makefile.inc
--- a/open-src/driver/xf86-video-cirrus/mapfiles.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-cirrus/mapfiles.patch Tue Jul 31 15:09:29 2007 -0700
@@ -47,16 +47,16 @@
+cirrus_drv_la_LDFLAGS += \
+ -Wl,-M,mapfile-cirrus_alpine-external \
+ -Wl,-M,mapfile-cirrus_laguna-external \
-+ -lddc -li2c -lint10 -lvgahw -lvbe
++ -lint10 -lvgahw -lvbe
+
+cirrus_alpine_la_LDFLAGS += \
+ -Wl,-M,mapfile-cirrus_drv-external \
-+ -lddc -lfb -li2c -lint10 -lramdac -lshadowfb -lvgahw -lxaa \
-+ -lxf1bpp -lxf4bpp -lXfont
++ -lfb -lint10 -lshadowfb -lvgahw -lxaa \
++ -lxf1bpp -lxf4bpp
+
+cirrus_laguna_la_LDFLAGS += \
+ -Wl,-M,mapfile-cirrus_drv-external \
-+ -lddc -lfb -li2c -lint10 -lramdac -lvgahw -lxaa
++ -lfb -lint10 -lvgahw -lxaa
+
+mapfiles: $(MAPFILES)
+
--- a/open-src/driver/xf86-video-cyrix/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-cyrix/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/01/31
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -53,7 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lshadowfb -lvbe -lvgahw -lxaa -lXfont
+ -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-dummy/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-dummy/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/01/31
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -51,6 +51,6 @@
DRIVER_ADD_LIBS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(MODULE_subdir) \
-R$(X11_SERVERMODS_DIR)$(MODULE_subdir) \
- -lramdac -lfb
+ -lfb
include ../Makefile.inc
--- a/open-src/driver/xf86-video-glint/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-glint/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# @(#)Makefile 1.5 07/07/31
#
# Package name used in tarballs
@@ -55,7 +55,7 @@
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)/linux$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe \
- -lvgahw -lxaa -lxf8_32bpp -lcfb -lmfb -lfbdevhw -lXfont
+ -lfb -lint10 -lshadowfb -lvbe \
+ -lvgahw -lxaa -lxf8_32bpp -lcfb -lmfb -lfbdevhw
include ../Makefile.inc
--- a/open-src/driver/xf86-video-i128/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-i128/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.6 07/01/31
+# @(#)Makefile 1.7 07/07/31
#
# Package name used in tarballs
@@ -53,7 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lexa -lfb -li2c -lramdac -lvgahw -lxaa -lXfont
+ -lexa -lfb -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-i740/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-i740/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/01/31
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -51,7 +51,7 @@
DRIVER_ADD_LIBS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lvbe -lvgahw -lxaa -lm
+ -lfb -lint10 -lvbe -lvgahw -lxaa -lm
include ../Makefile.inc
--- a/open-src/driver/xf86-video-i810/libraries.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-i810/libraries.patch Tue Jul 31 15:09:29 2007 -0700
@@ -8,7 +8,7 @@
+
+# Add libraries needed by driver module
+i810_drv_la_LDFLAGS += \
-+ -lddc -ldrm -lfb -li2c -lint10 -lramdac -lshadow -lshadowfb \
++ -ldrm -lfb -lint10 -lshadow -lshadowfb \
+ -lvbe -lvgahw -lxaa -ldri -lglx -lXfont -lm
--- src/xvmc/Makefile.am 2006-09-28 07:48:32.000000000 -0700
--- a/open-src/driver/xf86-video-mga/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-mga/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.8 07/07/25
+# @(#)Makefile 1.9 07/07/31
#
# Package name used in tarballs
@@ -55,8 +55,8 @@
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)/linux$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lexa -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe \
- -lvgahw -lxaa -lxf8_32bpp -lcfb -lmfb -lfbdevhw -lXfont
+ -lexa -lfb -lint10 -lshadowfb -lvbe \
+ -lvgahw -lxaa -lxf8_32bpp -lcfb -lmfb -lfbdevhw
include ../Makefile.inc
--- a/open-src/driver/xf86-video-neomagic/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-neomagic/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# @(#)Makefile 1.5 07/07/31
#
# Package name used in tarballs
@@ -51,7 +51,7 @@
DRIVER_ADD_LIBS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lshadow -lvbe -lvgahw -lxaa
+ -lfb -lint10 -lshadow -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-nsc/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-nsc/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# @(#)Makefile 1.5 07/07/31
#
# Package name used in tarballs
@@ -61,7 +61,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lvgahw -lxaa \
- -lXfont
+ -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-nv/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-nv/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.10 07/07/12
+# @(#)Makefile 1.11 07/07/31
#
# Package name used in tarballs
@@ -53,8 +53,7 @@
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR)/linux \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)/linux$(ARCHLIBSUBDIR) \
- -lddc -lexa -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lvgahw \
- -lxaa -lfbdevhw -lm
+ -lexa -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa -lfbdevhw -lm
include ../Makefile.inc
--- a/open-src/driver/xf86-video-rendition/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-rendition/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.6 07/01/31
+# @(#)Makefile 1.7 07/07/31
#
# Package name used in tarballs
@@ -53,8 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lvgahw -lxaa \
- -lXfont
+ -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-s3/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-s3/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/01/31
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -51,6 +51,6 @@
DRIVER_ADD_LIBS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lvbe -lvgahw -lxaa
+ -lfb -lint10 -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-s3virge/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-s3virge/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/01/31
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -53,8 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lvgahw -lxaa \
- -lXfont
+ -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-savage/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-savage/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# @(#)Makefile 1.5 07/07/31
#
# Package name used in tarballs
@@ -53,8 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lexa -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe \
- -lvgahw -lxaa -lXfont -lm
+ -lexa -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa -lm
include ../Makefile.inc
--- a/open-src/driver/xf86-video-siliconmotion/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-siliconmotion/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/03/21
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -53,7 +53,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lvgahw -lxaa \
- -lXfont -lexa
+ -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa -lexa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-sis/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-sis/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.6 07/01/31
+# @(#)Makefile 1.7 07/07/31
#
# Package name used in tarballs
@@ -56,8 +56,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lexa -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe \
- -lvgahw -lxaa -lXfont -lm
+ -lexa -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa -lm
include ../Makefile.inc
--- a/open-src/driver/xf86-video-tdfx/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-tdfx/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/01/31
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -51,6 +51,6 @@
DRIVER_ADD_LIBS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lramdac -lvbe -lvgahw -lxaa
+ -lfb -lint10 -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-tga/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-tga/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# @(#)Makefile 1.5 07/07/31
#
# Package name used in tarballs
@@ -51,7 +51,7 @@
DRIVER_ADD_LIBS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lramdac -lxaa
+ -lfb -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-trident/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-trident/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 07/07/25
+# @(#)Makefile 1.6 07/07/31
#
# Package name used in tarballs
@@ -53,8 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lexa -lfb -li2c -lint10 -lramdac -lshadow -lvbe -lvgahw -lxaa \
- -lXfont -lm
+ -lexa -lfb -lint10 -lshadow -lvbe -lvgahw -lxaa -lm
include ../Makefile.inc
--- a/open-src/driver/xf86-video-tseng/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-tseng/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# @(#)Makefile 1.5 07/07/31
#
# Package name used in tarballs
@@ -53,7 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lramdac -lvgahw -lxaa -lxf1bpp -lxf4bpp -lXfont
+ -lfb -lint10 -lvgahw -lxaa -lxf1bpp -lxf4bpp
include ../Makefile.inc
--- a/open-src/driver/xf86-video-vesa/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-vesa/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.6 07/02/27
+# @(#)Makefile 1.7 07/07/31
#
# Package name used in tarballs
@@ -53,6 +53,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lfb -li2c -lint10 -lshadow -lvbe -lxf1bpp -lxf4bpp -lXfont
+ -lfb -lint10 -lshadow -lvbe -lxf1bpp -lxf4bpp
include ../Makefile.inc
--- a/open-src/driver/xf86-video-vga/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-vga/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# @(#)Makefile 1.5 07/07/31
#
# Package name used in tarballs
@@ -53,6 +53,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lshadowfb -lvgahw -lxf1bpp -lxf4bpp -lXfont
+ -lfb -lint10 -lshadowfb -lvgahw -lxf1bpp -lxf4bpp
include ../Makefile.inc
--- a/open-src/driver/xf86-video-via/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-via/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# @(#)Makefile 1.5 07/07/31
#
# Package name used in tarballs
@@ -56,7 +56,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lddc -lexa -lfb -li2c -lint10 -lramdac -lshadowfb -lvbe -lvgahw \
- -lxaa -lXfont -lm
+ -lexa -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa -lm
include ../Makefile.inc
--- a/open-src/driver/xf86-video-vmware/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-vmware/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.6 07/02/13
+# @(#)Makefile 1.7 07/07/31
#
# Package name used in tarballs
@@ -53,6 +53,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lramdac -lshadowfb -lvgahw -lXfont
+ -lfb -lshadowfb -lvgahw
include ../Makefile.inc
--- a/open-src/driver/xf86-video-wsfb/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/driver/xf86-video-wsfb/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.6 07/01/26
+# @(#)Makefile 1.7 07/07/31
#
# Package name used in tarballs
@@ -56,6 +56,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(MODULE_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lshadow -lxf4bpp -lxf1bpp -lXfont
+ -lfb -lshadow -lxf4bpp -lxf1bpp
include ../Makefile.inc
--- a/open-src/xserver/xorg/6406044.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/6406044.patch Tue Jul 31 15:09:29 2007 -0700
@@ -31,9 +31,10 @@
Merge the fix for bug 6553135: libddc.so doesn't handle null mode
---- hw/xfree86/ddc/ddcProperty.c.orig Thu May 3 16:44:39 2007
-+++ hw/xfree86/ddc/ddcProperty.c Thu May 3 17:54:04 2007
-@@ -295,6 +295,25 @@
+diff -urp -x '*~' -x '*.orig' hw/xfree86/ddc/ddcProperty.c hw/xfree86/ddc/ddcProperty.c
+--- hw/xfree86/ddc/ddcProperty.c 2007-02-16 08:03:12.000000000 -0800
++++ hw/xfree86/ddc/ddcProperty.c 2007-07-30 18:38:26.379355000 -0700
+@@ -296,6 +296,25 @@ DDCGuessRangesFromModes(int scrnIndex, M
}
}
@@ -59,7 +60,7 @@
/*
* Fill out MonPtr with xf86MonPtr information.
*/
-@@ -374,6 +393,22 @@
+@@ -375,6 +394,22 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr
Mode = DDCModeFromDetailedTiming(scrnIndex,
&DDC->det_mon[i].section.d_timings,
preferred);
--- a/open-src/xserver/xorg/IA.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/IA.patch Tue Jul 31 15:09:29 2007 -0700
@@ -27,8 +27,8 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2006-12-01 14:48:41.000000000 -0800
-+++ Makefile.am 2007-01-18 08:22:59.519005000 -0800
+--- Makefile.am 2006-11-16 10:01:22.000000000 -0800
++++ Makefile.am 2007-07-30 18:33:49.554487000 -0700
@@ -58,6 +58,7 @@ SUBDIRS = \
$(XTRAP_DIR) \
$(COMPOSITE_DIR) \
@@ -38,9 +38,9 @@
hw
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2007-01-18 08:22:44.595715000 -0800
-+++ configure.ac 2007-01-18 08:22:59.518766000 -0800
-@@ -1867,3 +1867,6 @@ hw/xprint/config/en_US/print/Makefile
+--- configure.ac 2007-07-30 18:33:33.880185000 -0700
++++ configure.ac 2007-07-30 18:33:49.575258000 -0700
+@@ -1865,3 +1865,6 @@ hw/xprint/config/en_US/print/Makefile
hw/xprint/config/en_US/Makefile
xorg-server.pc
])
@@ -48,8 +48,8 @@
+# Add Sun IA extension
+AC_OUTPUT([IA/Makefile])
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
---- hw/xfree86/common/xf86AutoConfig.c 2006-12-01 08:15:54.000000000 -0800
-+++ hw/xfree86/common/xf86AutoConfig.c 2007-01-18 08:22:59.515973000 -0800
+--- hw/xfree86/common/xf86AutoConfig.c 2006-11-16 10:01:24.000000000 -0800
++++ hw/xfree86/common/xf86AutoConfig.c 2007-07-30 18:33:49.575752000 -0700
@@ -51,6 +51,7 @@
"\tLoad\t\"type1\"\n" \
"\tLoad\t\"record\"\n" \
@@ -59,8 +59,8 @@
#define BUILTIN_DEVICE_NAME \
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c 2006-12-01 14:48:41.000000000 -0800
-+++ hw/xfree86/common/xf86Config.c 2007-01-18 08:22:59.517641000 -0800
+--- hw/xfree86/common/xf86Config.c 2006-11-30 17:40:10.000000000 -0800
++++ hw/xfree86/common/xf86Config.c 2007-07-30 18:33:49.577216000 -0700
@@ -294,6 +294,10 @@ xf86ModulelistFromConfig(pointer **optli
ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL);
ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL);
@@ -73,8 +73,8 @@
/*
diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am 2006-12-01 14:48:41.000000000 -0800
-+++ hw/xfree86/dixmods/Makefile.am 2007-01-18 08:22:59.769629000 -0800
+--- hw/xfree86/dixmods/Makefile.am 2006-11-16 10:01:24.000000000 -0800
++++ hw/xfree86/dixmods/Makefile.am 2007-07-30 18:33:49.577490000 -0700
@@ -102,3 +102,10 @@ libxorgxkb_la_LIBADD = $(top_builddir)/d
libxtrap_la_LDFLAGS = -avoid-version
libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la
--- a/open-src/xserver/xorg/Makefile Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/Makefile Tue Jul 31 15:09:29 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.50 07/07/25
+# @(#)Makefile 1.51 07/07/31
#
PWD:sh=pwd
@@ -45,7 +45,7 @@
MODULE_NAME=xorg-server
# Version number (used in path names)
-XORGSERVER_VERS=1.2.0
+XORGSERVER_VERS=1.3.0.0
# Source tarball
SOURCE_TARBALL_NAME=$(MODULE_NAME)-$(XORGSERVER_VERS).tar.bz2
@@ -53,17 +53,12 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
- xf1bpp.patch,-p1 \
xephyr.patch,-p1 \
- immu.h.patch,-p1 \
- server-libs.patch \
dtrace.patch \
automake-1.10.patch,-p1 \
- client-privates-leak.patch,-p1 \
- ddc.patch,-p1 \
- xcmisc-security.patch \
render-security.patch,-p1 \
- ast-driver.patch \
+ ramdac-symbols.patch,-p1 \
+ RandR-1.2-man.patch,-p1 \
sun-paths.patch \
sun-extramodes.patch \
sun-apm.patch \
@@ -84,7 +79,6 @@
Xorg-mapfile.patch \
bitstream.patch \
xevie.patch \
- sparc.patch,-p1 \
wsfb.patch \
sparc-probe.patch \
glx-byteswap.patch \
@@ -95,7 +89,6 @@
autoconfig2.patch \
6406044.patch \
cfbmskbits.patch \
- xf86ModesAdd.patch \
lg3d.patch \
6535006.patch \
6540484.patch \
@@ -160,6 +153,7 @@
--with-module-dir=$(MODULES_DIR) \
--with-dri-driver-path=$(DRI_MODULES_DIR) \
--with-xkb-path='$${libdir}/X11/xkb' \
+ --with-rgb-path='$${libdir}/X11/rgb' \
--with-default-font-path="$(FONTDIR)/TrueType/,$(FONTDIR)/Type1/,$(FONTDIR)/Type1/sun/,$(FONTDIR)/F3bitmaps/,$(FONTDIR)/misc/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/"
CONFIG_OPTS_sparc=$(CONFIG_OPTS_COMMON)
@@ -188,9 +182,12 @@
# DEFAULT_GCC_CFLAGS = -g -O3 -fno-omit-frame-pointer -Wall
# Environment variable options to GNU autoconf configure script
+# - XSERVERCFLAGS_CFLAGS - force CFLAGS to avoid -I /usr/X11/include breaking
+# use of headers from proto area
CONFIG_ENV_common = \
PKG_CONFIG_PATH=$(PROTODIR)/usr/lib$(ARCHLIBSUBDIR)/pkgconfig:$(TOP)/common/pc-files/$(BUILD_DIR):/usr/lib$(ARCHLIBSUBDIR)/pkgconfig \
INSTALL="$(TOP)/common/install-sh -c" CPPROG="cp -p" \
+ XSERVERCFLAGS_CFLAGS="-DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API" \
PATH=$(PATH):/usr/sbin
LDPATH_ADD = -L$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/RandR-1.2-man.patch Tue Jul 31 15:09:29 2007 -0700
@@ -0,0 +1,152 @@
+commit 92ba435bd9aa7b6eca9aef8e5193576ef62fc9db
+Author: Eric Anholt <[email protected]>
+Date: Mon Mar 26 12:44:58 2007 -0700
+
+ Update xorg.conf manpage for new RandR 1.2 monitor options.
+
+diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
+index bbba211..cc60d07 100644
+--- a/hw/xfree86/doc/man/xorg.conf.man.pre
++++ b/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -1004,12 +1004,22 @@ The
+ .B Identifier
+ entry specifies the unique name for this monitor. The
+ .B Monitor
+-section provides information about the specifications of the monitor,
+-monitor-specific
++section may be used to provide information about the specifications of the
++monitor, monitor-specific
+ .BR Options ,
+-and information about the video modes to use with the monitor. Specifying
+-video modes is optional because the server now has a built-in list of
+-VESA standard modes. When modes are specified explicitly in the
++and information about the video modes to use with the monitor.
++.PP
++With RandR 1.2-enabled drivers, monitor sections are tied to specific outputs
++of the video card. Each output has a name, and the server will look for a
++Monitor named
++.B \*qMonitor-outputname\*q
++for configuration of that output (for example,
++.B \*qMonitor-VGA\*q
++for a VGA output)
++.PP
++Specifying video modes is optional because the server will use the DDC or other
++information provided by the monitor to automatically configure the list of
++modes available. When modes are specified explicitly in the
+ .B Monitor
+ section (with the
+ .BR Modes ,
+@@ -1017,7 +1027,8 @@ section (with the
+ or
+ .B UseModes
+ keywords), built-in modes with the same names are not included. Built-in
+-modes with different names are, however, still implicitly included.
++modes with different names are, however, still implicitly included, when they
++meet the requirements of the monitor.
+ .PP
+ The entries that may be used in
+ .B Monitor
+@@ -1214,6 +1225,62 @@ monitors do not require it. The default
+ This optional entry specifies the vertical refresh rate that the server
+ should aim for when selecting video modes. Without this option, the
+ default is to prefer modes with higher refresh rates.
++.TP 7
++.BI "Option " "\*qPreferredMode\*q " \*qstring\*q
++This optional entry specifies a mode to be marked as the preferred initial mode
++of the monitor.
++(RandR 1.2-supporting drivers only)
++.TP 7
++.BI "Option " "\*qPosition\*q " "\*qx y\*q"
++This optional entry specifies the position of the monitor within the X
++screen.
++(RandR 1.2-supporting drivers only)
++.TP 7
++.BI "Option " "\*qLeftOf\*q " \*qmonitor\*q
++This optional entry specifies that the monitor should be positioned to the
++left of the monitor of the given name.
++(RandR 1.2-supporting drivers only)
++.TP 7
++.BI "Option " "\*qRightOf\*q " \*qmonitor\*q
++This optional entry specifies that the monitor should be positioned to the
++right of the monitor of the given name.
++(RandR 1.2-supporting drivers only)
++.TP 7
++.BI "Option " "\*qAbove\*q " \*qmonitor\*q
++This optional entry specifies that the monitor should be positioned above the
++monitor of the given name.
++(RandR 1.2-supporting drivers only)
++.TP 7
++.BI "Option " "\*qBelow\*q " \*qmonitor\*q
++This optional entry specifies that the monitor should be positioned below the
++monitor of the given name.
++(RandR 1.2-supporting drivers only)
++.TP 7
++.BI "Option " "\*qEnable\*q " \*qbool\*q
++This optional entry specifies whether the monitor should be turned on
++at startup. By default, the server will attempt to enable all connected
++monitors.
++(RandR 1.2-supporting drivers only)
++.TP 7
++.BI "Option " "\*qMinClock\*q " \*qfrequency\*q
++This optional entry specifies the minimum dot clock, in kHz, that is supported
++by the monitor.
++.TP 7
++.BI "Option " "\*qMaxClock\*q " \*qfrequency\*q
++This optional entry specifies the maximum dot clock, in kHz, that is supported
++by the monitor.
++.TP 7
++.BI "Option " "\*qIgnore\*q " \*qbool\*q
++This optional entry specifies that the monitor should be ignored entirely,
++and not reported through RandR. This is useful if the hardware reports the
++presence of outputs that don't exist.
++(RandR 1.2-supporting drivers only)
++.TP 7
++.BI "Option " "\*qRotate\*q " \*qrotation\*q
++This optional entry specifies the initial rotation of the given monitor.
++Valid values for rotation are \*qnormal\*q, \*qleft\*q, \*qright\*q, and
++\*qinverted\*q.
++(RandR 1.2-supporting drivers only)
+
+ .SH MODES SECTION
+ The config file may have multiple
+
+
+commit 3de1f0d03b329b01856f664651db23ffefb58646
+Author: Eric Anholt <[email protected]>
+Date: Tue May 29 10:08:58 2007 -0700
+
+ Fix documentation of association of outputs to monitor sections in xorg.conf(5)
+
+diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
+index 4103974..504e0c2 100644
+--- a/hw/xfree86/doc/man/xorg.conf.man.pre
++++ b/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -1009,14 +1009,22 @@ monitor, monitor-specific
+ .BR Options ,
+ and information about the video modes to use with the monitor.
+ .PP
+-With RandR 1.2-enabled drivers, monitor sections are tied to specific outputs
+-of the video card. Each output has a name, and the server will look for a
+-Monitor named
+-.B \*qMonitor-outputname\*q
+-for configuration of that output (for example,
+-.B \*qMonitor-VGA\*q
++With RandR 1.2-enabled drivers, monitor sections may be tied to specific
++outputs of the video card. Using the name of the output defined by the video
++driver plus the identifier of a monitor section, one associates a monitor
++section with an output by adding an option to the Device section in the
++following format:
++
++.B Option \*qMonitor-outputname\*q \*qmonitorsection\*q
++
++(for example,
++.B Option \*qMonitor-VGA\*q \*qVGA monitor\*q
+ for a VGA output)
+ .PP
++In the absence of specific association of monitor sections to outputs, if a
++monitor section is present the server will associate it with an output to
++preserve compatibility for previous single-head configurations.
++.PP
+ Specifying video modes is optional because the server will use the DDC or other
+ information provided by the monitor to automatically configure the list of
+ modes available.
--- a/open-src/xserver/xorg/Xorg-mapfile.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/Xorg-mapfile.patch Tue Jul 31 15:09:29 2007 -0700
@@ -1,7 +1,7 @@
-diff -urp -x '*~' hw/xfree86/Makefile.am hw/xfree86/Makefile.am
---- hw/xfree86/Makefile.am 2006-12-21 10:50:46.000000000 -0800
-+++ hw/xfree86/Makefile.am 2006-12-21 14:23:16.576806000 -0800
-@@ -56,7 +56,7 @@ Xorg_LDADD = $(XORG_LIBS) \
+diff -urp -x '*~' -x '*.orig' hw/xfree86/Makefile.am hw/xfree86/Makefile.am
+--- hw/xfree86/Makefile.am 2007-07-30 18:35:09.238323000 -0700
++++ hw/xfree86/Makefile.am 2007-07-30 18:35:26.620143000 -0700
+@@ -60,7 +60,7 @@ Xorg_LDADD = $(XORG_LIBS) \
@XSERVER_LIBS@ \
dixmods/libxorgxkb.la
--- a/open-src/xserver/xorg/amd64-loader-path.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/amd64-loader-path.patch Tue Jul 31 15:09:29 2007 -0700
@@ -79,12 +79,3 @@
i++;
s++;
if (indefault && !s) {
-@@ -903,8 +922,8 @@ doLoadModule(const char *module, const c
- * check the elements in the path
- */
- if (PathIsAbsolute(module))
-- xstrdup(module);
-+ found = xstrdup(module);
- path_elem = pathlist;
- while (!found && *path_elem != NULL) {
- found = FindModule(m, *path_elem, subdirlist, patterns);
--- a/open-src/xserver/xorg/cli-nobanner.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/cli-nobanner.patch Tue Jul 31 15:09:29 2007 -0700
@@ -26,10 +26,10 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
-diff -urp -x '*~' os/utils.c os/utils.c
---- os/utils.c 2006-12-21 14:20:53.648154000 -0800
-+++ os/utils.c 2006-12-21 14:21:08.732783000 -0800
-@@ -929,6 +929,12 @@ ProcessCommandLine(int argc, char *argv[
+diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
+--- os/utils.c 2007-07-30 18:32:29.905008000 -0700
++++ os/utils.c 2007-07-30 18:32:46.146428000 -0700
+@@ -913,6 +913,12 @@ ProcessCommandLine(int argc, char *argv[
}
#endif
#endif
--- a/open-src/xserver/xorg/cli-nolock.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/cli-nolock.patch Tue Jul 31 15:09:29 2007 -0700
@@ -27,10 +27,10 @@
# of the copyright holder.
-diff -urp -x '*~' os/utils.c os/utils.c
---- os/utils.c 2006-12-21 10:50:47.000000000 -0800
-+++ os/utils.c 2006-12-21 14:20:53.648154000 -0800
-@@ -630,9 +630,11 @@ void UseMsg(void)
+diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
+--- os/utils.c 2007-04-19 19:13:13.000000000 -0700
++++ os/utils.c 2007-07-30 18:32:29.905008000 -0700
+@@ -614,9 +614,11 @@ void UseMsg(void)
#ifdef RLIMIT_STACK
ErrorF("-ls int limit stack space to N Kb\n");
#endif
@@ -42,7 +42,7 @@
#ifndef NOLOGOHACK
ErrorF("-logo enable logo in screen saver\n");
ErrorF("nologo disable logo in screen saver\n");
-@@ -914,6 +916,7 @@ ProcessCommandLine(int argc, char *argv[
+@@ -898,6 +900,7 @@ ProcessCommandLine(int argc, char *argv[
UseMsg();
}
#endif
@@ -50,7 +50,7 @@
#ifdef SERVER_LOCK
else if ( strcmp ( argv[i], "-nolock") == 0)
{
-@@ -925,6 +928,7 @@ ProcessCommandLine(int argc, char *argv[
+@@ -909,6 +912,7 @@ ProcessCommandLine(int argc, char *argv[
nolock = TRUE;
}
#endif
--- a/open-src/xserver/xorg/dri.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/dri.patch Tue Jul 31 15:09:29 2007 -0700
@@ -26,10 +26,10 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
-diff -urp -x '*~' configure.ac configure.ac
---- configure.ac 2006-12-21 14:24:58.815869000 -0800
-+++ configure.ac 2006-12-21 14:25:15.153507000 -0800
-@@ -282,6 +282,12 @@ case $host_os in
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac 2007-07-30 18:37:03.938884000 -0700
++++ configure.ac 2007-07-30 18:37:20.626554000 -0700
+@@ -300,6 +300,12 @@ case $host_os in
DRI=yes
KDRIVE_HW=yes
;;
@@ -42,9 +42,9 @@
esac
AM_CONDITIONAL(KDRIVE_HW, test "x$KDRIVE_HW" = xyes)
-diff -urp -x '*~' hw/xfree86/os-support/solaris/agpgart.h hw/xfree86/os-support/solaris/agpgart.h
---- hw/xfree86/os-support/solaris/agpgart.h 2006-11-13 16:59:40.000000000 -0800
-+++ hw/xfree86/os-support/solaris/agpgart.h 2006-12-21 14:25:15.153928000 -0800
+diff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/solaris/agpgart.h hw/xfree86/os-support/solaris/agpgart.h
+--- hw/xfree86/os-support/solaris/agpgart.h 2006-09-17 23:04:18.000000000 -0700
++++ hw/xfree86/os-support/solaris/agpgart.h 2007-07-30 18:37:20.681168000 -0700
@@ -23,7 +23,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
--- a/open-src/xserver/xorg/dtlogin-userinfo.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/dtlogin-userinfo.patch Tue Jul 31 15:09:29 2007 -0700
@@ -26,10 +26,10 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
-diff -urp -x '*~' configure.ac configure.ac
---- configure.ac 2006-12-21 14:21:37.260843000 -0800
-+++ configure.ac 2006-12-21 14:21:51.350495000 -0800
-@@ -881,6 +881,7 @@ PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQ
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac 2007-07-30 18:33:18.270657000 -0700
++++ configure.ac 2007-07-30 18:33:33.880185000 -0700
+@@ -887,6 +887,7 @@ PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQ
PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}"
@@ -37,9 +37,9 @@
XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
AC_SUBST([SYS_LIBS])
-diff -urp -x '*~' os/Makefile.am os/Makefile.am
---- os/Makefile.am 2006-12-21 14:21:37.266897000 -0800
-+++ os/Makefile.am 2006-12-21 14:21:51.334148000 -0800
+diff -urp -x '*~' -x '*.orig' os/Makefile.am os/Makefile.am
+--- os/Makefile.am 2007-07-30 18:33:18.179832000 -0700
++++ os/Makefile.am 2007-07-30 18:33:33.905121000 -0700
@@ -27,6 +27,7 @@ libos_la_SOURCES = \
xdmauth.c \
xstrans.c \
@@ -49,7 +49,7 @@
if XCSECURITY
@@ -41,6 +42,8 @@ if NEED_STRLCAT
- libos_la_SOURCES += $(STRLCAT_SOURCES)
+ libos_la_SOURCES += $(STRLCAT_SRCS)
endif
+libos_la_LIBADD = -lproject
@@ -57,9 +57,9 @@
libcwrapper_la_SOURCES = \
$(top_srcdir)/hw/xfree86/os-support/shared/libc_wrapper.c
libcwrapper_la_CFLAGS = \
-diff -urp -x '*~' os/auth.c os/auth.c
---- os/auth.c 2006-11-13 16:59:41.000000000 -0800
-+++ os/auth.c 2006-12-21 14:21:51.334597000 -0800
+diff -urp -x '*~' -x '*.orig' os/auth.c os/auth.c
+--- os/auth.c 2006-09-17 23:04:18.000000000 -0700
++++ os/auth.c 2007-07-30 18:33:33.905663000 -0700
@@ -332,6 +332,19 @@ AddAuthorization (unsigned name_length,
return 0;
}
@@ -80,9 +80,9 @@
#ifdef XCSECURITY
XID
-diff -urp -x '*~' os/connection.c os/connection.c
---- os/connection.c 2006-12-21 14:21:37.267651000 -0800
-+++ os/connection.c 2006-12-21 14:21:51.340845000 -0800
+diff -urp -x '*~' -x '*.orig' os/connection.c os/connection.c
+--- os/connection.c 2007-07-30 18:33:18.168637000 -0700
++++ os/connection.c 2007-07-30 18:33:33.906523000 -0700
@@ -176,6 +176,10 @@ typedef const char *string;
# include "../dix/Xserver-dtrace.h"
#endif
--- a/open-src/xserver/xorg/dtrace.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/dtrace.patch Tue Jul 31 15:09:29 2007 -0700
@@ -1,6 +1,4 @@
-Xserver dtrace provider 0.2 for Xorg server 1.2
-
-/* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+/* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
@@ -28,18 +26,6 @@
* of the copyright holder.
*/
-This patch is built against the Xorg server 1.2 RC1 (aka X11R7.2 RC1).
-Download the base source from
-http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.1.99.901.tar.bz2
-To build, do:
- bzcat xorg-server-1.1.99.901.tar.bz2 | tar -xf -
- cd xorg-server-1.1.99.901
- gpatch -p0 < 7.2-dtrace.patch
- ./configure ; make
-
-Once you're done, you should be able to drop in hw/xfree86/Xorg
-as a replacement for /usr/X11/bin/Xorg on a Solaris 10 or Nevada/Express
-system.
--- dix/Xserver.d 1969-12-31 16:00:00.000000000 -0800
+++ dix/Xserver.d 2005-07-04 11:09:17.267106000 -0700
@@ -104,10 +90,10 @@
+#pragma D attributes Unstable/Unstable/Common provider Xserver args
+
-diff -urp -x '*~' configure.ac configure.ac
---- configure.ac 2006-10-13 15:53:18.000000000 -0700
-+++ configure.ac 2006-10-30 14:16:57.837404000 -0800
-@@ -64,6 +64,15 @@ AC_PROG_LEX
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac 2007-04-19 18:23:40.000000000 -0700
++++ configure.ac 2007-07-30 18:29:34.753611000 -0700
+@@ -77,6 +77,15 @@ AC_PROG_LEX
AC_PROG_YACC
XORG_PROG_RAWCPP
@@ -123,7 +109,7 @@
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
-@@ -852,8 +861,8 @@ AC_DEFINE(XCMISC, 1, [Support XCMisc ext
+@@ -860,8 +869,8 @@ AC_DEFINE(XCMISC, 1, [Support XCMisc ext
AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])
AC_DEFINE(PIXPRIV, 1, [Support pixmap privates])
@@ -134,9 +120,9 @@
CWRAP_LIB='$(top_builddir)/os/libcwrapper.la'
MI_LIB='$(top_builddir)/mi/libmi.la'
MINIMI_LIB='$(top_builddir)/mi/libminimi.la'
-diff -urp -x '*~' dix/Makefile.am dix/Makefile.am
---- dix/Makefile.am 2006-10-11 15:42:19.000000000 -0700
-+++ dix/Makefile.am 2006-10-30 14:16:57.801240000 -0800
+diff -urp -x '*~' -x '*.orig' dix/Makefile.am dix/Makefile.am
+--- dix/Makefile.am 2006-11-16 10:01:22.000000000 -0800
++++ dix/Makefile.am 2007-07-30 18:29:34.754152000 -0700
@@ -37,4 +37,21 @@ libxpstubs_la_SOURCES = \
INCLUDES = -I$(top_srcdir)/Xprint
@@ -155,14 +141,14 @@
+dtrace-os.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
+ $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o
+
-+noinst_LIBRARIES = dix.O
++noinst_PROGRAMS = dix.O
+
+dix.O: dtrace-os.o $(am_libdix_la_OBJECTS)
+ ld -r -o $@ dtrace-os.o .libs/*.o
+endif
-diff -urp -x '*~' dix/dispatch.c dix/dispatch.c
---- dix/dispatch.c 2006-10-11 15:42:19.000000000 -0700
-+++ dix/dispatch.c 2006-10-30 14:16:57.798697000 -0800
+diff -urp -x '*~' -x '*.orig' dix/dispatch.c dix/dispatch.c
+--- dix/dispatch.c 2006-11-16 10:01:22.000000000 -0800
++++ dix/dispatch.c 2007-07-30 18:29:34.761328000 -0700
@@ -74,6 +74,36 @@ Equipment Corporation.
******************************************************************/
@@ -274,7 +260,7 @@
if (client->index < nextFreeClientID)
nextFreeClientID = client->index;
clients[client->index] = NullClient;
-@@ -3991,3 +4051,60 @@ MarkClientException(ClientPtr client)
+@@ -3990,3 +4050,60 @@ MarkClientException(ClientPtr client)
{
client->noClientException = -1;
}
@@ -335,9 +321,9 @@
+}
+
+#endif
-diff -urp -x '*~' dix/events.c dix/events.c
---- dix/events.c 2006-10-11 15:42:19.000000000 -0700
-+++ dix/events.c 2006-10-30 14:16:57.839461000 -0800
+diff -urp -x '*~' -x '*.orig' dix/events.c dix/events.c
+--- dix/events.c 2006-11-16 10:01:22.000000000 -0800
++++ dix/events.c 2007-07-30 18:29:34.764143000 -0700
@@ -139,6 +139,12 @@ extern Bool XkbFilterEvents(ClientPtr, i
#include "xace.h"
#endif
@@ -366,9 +352,9 @@
if(pClient->swapped)
{
for(i = 0; i < count; i++)
-diff -urp -x '*~' dix/extension.c dix/extension.c
---- dix/extension.c 2006-10-11 15:42:19.000000000 -0700
-+++ dix/extension.c 2006-10-30 14:16:57.799190000 -0800
+diff -urp -x '*~' -x '*.orig' dix/extension.c dix/extension.c
+--- dix/extension.c 2006-11-16 10:01:23.000000000 -0800
++++ dix/extension.c 2007-07-30 18:29:34.808650000 -0700
@@ -482,3 +482,17 @@ RegisterScreenProc(char *name, ScreenPtr
}
return TRUE;
@@ -387,9 +373,9 @@
+ }
+}
+#endif
-diff -urp -x '*~' dix/resource.c dix/resource.c
---- dix/resource.c 2006-10-11 15:42:19.000000000 -0700
-+++ dix/resource.c 2006-10-30 14:16:57.799909000 -0800
+diff -urp -x '*~' -x '*.orig' dix/resource.c dix/resource.c
+--- dix/resource.c 2006-11-16 10:01:23.000000000 -0800
++++ dix/resource.c 2007-07-30 18:29:34.809719000 -0700
@@ -72,6 +72,34 @@ dealings in this Software without prior
Equipment Corporation.
@@ -495,12 +481,12 @@
*head = this->next;
if (rtype & RC_CACHED)
FlushClientCaches(this->id);
-diff -urp -x '*~' include/dix-config.h.in include/dix-config.h.in
---- include/dix-config.h.in 2006-10-11 15:42:19.000000000 -0700
-+++ include/dix-config.h.in 2006-10-30 14:16:57.801020000 -0800
-@@ -442,4 +442,10 @@
- /* Define to 1 if modules should avoid the libcwrapper */
- #undef NO_LIBCWRAPPER
+diff -urp -x '*~' -x '*.orig' include/dix-config.h.in include/dix-config.h.in
+--- include/dix-config.h.in 2007-01-29 22:03:18.000000000 -0800
++++ include/dix-config.h.in 2007-07-30 18:29:34.810329000 -0700
+@@ -440,4 +440,10 @@
+ /* Have a monotonic clock from clock_gettime() */
+ #undef MONOTONIC_CLOCK
+/* Define to 1 if the DTrace Xserver provider probes should be built in */
+#undef XSERVER_DTRACE
@@ -509,9 +495,9 @@
+#undef XERRORDB_PATH
+
#endif /* _DIX_CONFIG_H_ */
-diff -urp -x '*~' os/Makefile.am os/Makefile.am
---- os/Makefile.am 2006-10-11 15:42:19.000000000 -0700
-+++ os/Makefile.am 2006-10-30 14:16:57.836238000 -0800
+diff -urp -x '*~' -x '*.orig' os/Makefile.am os/Makefile.am
+--- os/Makefile.am 2006-11-30 17:40:11.000000000 -0800
++++ os/Makefile.am 2007-07-30 18:29:34.810652000 -0700
@@ -50,3 +50,15 @@ libcwrapper_la_CFLAGS = \
EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES) \
@@ -522,16 +508,16 @@
+dtrace-os.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
+ $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o
+
-+noinst_LIBRARIES = os.O
++noinst_PROGRAMS = os.O
+
+os.O: dtrace-os.o $(am_libos_la_OBJECTS)
+ ld -r -o $@ dtrace-os.o .libs/*.o
+
+endif
-diff -urp -x '*~' os/connection.c os/connection.c
---- os/connection.c 2006-10-11 15:42:19.000000000 -0700
-+++ os/connection.c 2006-10-30 14:16:57.800659000 -0800
-@@ -165,6 +165,12 @@ extern __const__ int _nfiles;
+diff -urp -x '*~' -x '*.orig' os/connection.c os/connection.c
+--- os/connection.c 2007-02-17 17:37:56.000000000 -0800
++++ os/connection.c 2007-07-30 18:29:34.811624000 -0700
+@@ -170,6 +170,12 @@ extern __const__ int _nfiles;
# include <zone.h>
#endif
@@ -544,7 +530,7 @@
int lastfdesc; /* maximum file descriptor */
fd_set WellKnownConnections; /* Listener mask */
-@@ -585,6 +592,10 @@ AuthAudit (ClientPtr client, Bool letin,
+@@ -618,6 +624,10 @@ AuthAudit (ClientPtr client, Bool letin,
else {
client_uid_string[0] = '\0';
}
@@ -555,8 +541,7 @@
if (proto_n)
AuditF("client %d %s from %s%s\n Auth name: %.*s ID: %d\n",
-@@ -593,7 +604,25 @@ AuthAudit (ClientPtr client, Bool letin,
- else
+@@ -627,6 +637,24 @@ AuthAudit (ClientPtr client, Bool letin,
AuditF("client %d %s from %s%s\n",
client->index, letin ? "connected" : "rejected", addr,
client_uid_string);
@@ -581,7 +566,7 @@
}
XID
-@@ -659,7 +688,9 @@ ClientAuthorized(ClientPtr client,
+@@ -693,7 +721,9 @@ ClientAuthorized(ClientPtr client,
else
{
auth_id = (XID) 0;
@@ -591,7 +576,7 @@
AuthAudit(client, TRUE,
(struct sockaddr *) from, fromlen,
proto_n, auth_proto, auth_id);
-@@ -675,7 +706,11 @@ ClientAuthorized(ClientPtr client,
+@@ -709,7 +739,11 @@ ClientAuthorized(ClientPtr client,
return "Client is not authorized to connect to Server";
}
}
@@ -603,7 +588,7 @@
{
if (_XSERVTransGetPeerAddr (trans_conn,
&family, &fromlen, &from) != -1)
-@@ -753,6 +788,9 @@ AllocNewConnection (XtransConnInfo trans
+@@ -787,6 +821,9 @@ AllocNewConnection (XtransConnInfo trans
ErrorF("AllocNewConnection: client index = %d, socket fd = %d\n",
client->index, fd);
#endif
--- a/open-src/xserver/xorg/lg3d.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/lg3d.patch Tue Jul 31 15:09:29 2007 -0700
@@ -27,8 +27,8 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' Xext/Makefile.am Xext/Makefile.am
---- Xext/Makefile.am 2007-01-23 09:30:43.313604000 -0800
-+++ Xext/Makefile.am 2007-01-23 09:30:59.730254000 -0800
+--- Xext/Makefile.am 2007-07-30 18:38:42.289597000 -0700
++++ Xext/Makefile.am 2007-07-30 18:38:58.872659000 -0700
@@ -153,6 +153,12 @@ endif
TSOL_SRCS = tsolCompat.c
BUILTIN_SRCS += $(TSOL_SRCS)
@@ -51,9 +51,9 @@
+ $(LGE_SRCS)
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2007-01-23 09:30:44.143027000 -0800
-+++ configure.ac 2007-01-23 09:30:59.732551000 -0800
-@@ -434,6 +434,7 @@ AC_ARG_ENABLE(appgroup, AS_HELP_ST
+--- configure.ac 2007-07-30 18:38:42.685647000 -0700
++++ configure.ac 2007-07-30 18:38:58.875135000 -0700
+@@ -444,6 +444,7 @@ AC_ARG_ENABLE(appgroup, AS_HELP_ST
AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
@@ -61,7 +61,7 @@
AC_ARG_ENABLE(cup, AS_HELP_STRING([--disable-cup], [Build TOG-CUP extension (default: enabled)]), [CUP=$enableval], [CUP=yes])
AC_ARG_ENABLE(evi, AS_HELP_STRING([--disable-evi], [Build Extended-Visual-Information extension (default: enabled)]), [EVI=$enableval], [EVI=yes])
AC_ARG_ENABLE(multibuffer, AS_HELP_STRING([--enable-multibuffer], [Build Multibuffer extension (default: disabled)]), [MULTIBUFFER=$enableval], [MULTIBUFFER=no])
-@@ -663,6 +664,12 @@ if test "x$XEVIE" = xyes; then
+@@ -673,6 +674,12 @@ if test "x$XEVIE" = xyes; then
REQUIRED_MODULES="$REQUIRED_MODULES evieproto"
fi
@@ -74,7 +74,7 @@
AM_CONDITIONAL(APPGROUP, [test "x$APPGROUP" = xyes])
if test "x$APPGROUP" = xyes; then
if test "x$XACE" != xyes || test "x$XCSECURITY" != xyes; then
-@@ -886,7 +893,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
+@@ -896,7 +903,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
@@ -84,8 +84,8 @@
XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
AC_SUBST([SYS_LIBS])
diff -urp -x '*~' -x '*.orig' dix/Makefile.am dix/Makefile.am
---- dix/Makefile.am 2007-01-23 09:30:42.885307000 -0800
-+++ dix/Makefile.am 2007-01-23 09:30:59.732856000 -0800
+--- dix/Makefile.am 2007-07-30 18:38:41.946697000 -0700
++++ dix/Makefile.am 2007-07-30 18:38:58.875437000 -0700
@@ -30,7 +30,8 @@ libdix_la_SOURCES = \
swapreq.c \
tables.c \
@@ -97,8 +97,8 @@
libxpstubs_la_SOURCES = \
xpstubs.c
diff -urp -x '*~' -x '*.orig' dix/events.c dix/events.c
---- dix/events.c 2007-01-23 09:30:43.317946000 -0800
-+++ dix/events.c 2007-01-23 09:30:59.735623000 -0800
+--- dix/events.c 2007-07-30 18:38:42.325047000 -0700
++++ dix/events.c 2007-07-30 18:38:58.878579000 -0700
@@ -167,6 +167,23 @@ xEvent *xeviexE;
#include "dixgrabs.h"
#include "dispatch.h"
@@ -721,8 +721,8 @@
+
+#endif /* LG3D */
diff -urp -x '*~' -x '*.orig' dix/extension.c dix/extension.c
---- dix/extension.c 2007-01-23 09:30:42.890649000 -0800
-+++ dix/extension.c 2007-01-23 09:30:59.736155000 -0800
+--- dix/extension.c 2007-07-30 18:38:41.952219000 -0700
++++ dix/extension.c 2007-07-30 18:38:58.879424000 -0700
@@ -63,6 +63,10 @@ SOFTWARE.
#include "xace.h"
#endif
@@ -781,8 +781,8 @@
memmove(bufptr, extensions[i]->name, len);
bufptr += len;
diff -urp -x '*~' -x '*.orig' include/globals.h include/globals.h
---- include/globals.h 2007-01-22 21:39:17.000000000 -0800
-+++ include/globals.h 2007-01-23 09:30:59.736432000 -0800
+--- include/globals.h 2006-09-17 23:04:18.000000000 -0700
++++ include/globals.h 2007-07-30 18:38:58.898264000 -0700
@@ -184,4 +184,8 @@ extern Bool noXIdleExtension;
extern Bool noXvExtension;
#endif
@@ -793,8 +793,8 @@
+
#endif /* !_XSERV_GLOBAL_H_ */
diff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
---- mi/miinitext.c 2007-01-23 09:30:43.358019000 -0800
-+++ mi/miinitext.c 2007-01-23 09:30:59.768288000 -0800
+--- mi/miinitext.c 2007-07-30 18:38:42.408483000 -0700
++++ mi/miinitext.c 2007-07-30 18:38:58.899770000 -0700
@@ -88,6 +88,11 @@ SOFTWARE.
#include "extnsionst.h"
#endif
@@ -942,8 +942,8 @@
/* Add built-in extensions to the list. */
for (i = 0; staticExtensions[i].name; i++)
diff -urp -x '*~' -x '*.orig' mi/misprite.c mi/misprite.c
---- mi/misprite.c 2007-01-22 21:39:17.000000000 -0800
-+++ mi/misprite.c 2007-01-23 09:30:59.768903000 -0800
+--- mi/misprite.c 2006-09-17 23:04:18.000000000 -0700
++++ mi/misprite.c 2007-07-30 18:38:58.909854000 -0700
@@ -156,8 +156,23 @@ miSpriteInitialize (pScreen, cursorFuncs
miSpriteScreenPtr pScreenPriv;
VisualPtr pVisual;
@@ -969,8 +969,8 @@
if (miSpriteGeneration != serverGeneration)
{
diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
---- os/utils.c 2007-01-23 09:30:43.571510000 -0800
-+++ os/utils.c 2007-01-23 09:30:59.799315000 -0800
+--- os/utils.c 2007-07-30 18:38:42.573625000 -0700
++++ os/utils.c 2007-07-30 18:38:58.935850000 -0700
@@ -236,6 +236,9 @@ _X_EXPORT Bool noXIdleExtension = FALSE;
#ifdef XV
_X_EXPORT Bool noXvExtension = FALSE;
@@ -982,8 +982,8 @@
#define X_INCLUDE_NETDB_H
#include <X11/Xos_r.h>
diff -urp -x '*~' -x '*.orig' xkb/xkbPrKeyEv.c xkb/xkbPrKeyEv.c
---- xkb/xkbPrKeyEv.c 2007-01-22 21:39:17.000000000 -0800
-+++ xkb/xkbPrKeyEv.c 2007-01-23 09:30:59.799841000 -0800
+--- xkb/xkbPrKeyEv.c 2006-09-17 23:04:18.000000000 -0700
++++ xkb/xkbPrKeyEv.c 2007-07-30 18:38:58.940146000 -0700
@@ -39,6 +39,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XKBsrv.h>
#include <ctype.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/ramdac-symbols.patch Tue Jul 31 15:09:29 2007 -0700
@@ -0,0 +1,76 @@
+commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17
+Author: Julien Cristau <[email protected]>
+Date: Tue May 29 22:01:30 2007 -0400
+
+ Make sure that the ramdac symbols are present in the server
+
+ The former ramdac module is now built into the server, so its symbols need to
+ be explicitly exported to drivers (Debian #423129).
+
+diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
+index 5175f01..6535e4c 100644
+--- a/hw/xfree86/loader/xf86sym.c
++++ b/hw/xfree86/loader/xf86sym.c
+@@ -96,6 +96,11 @@ #include "xf86RandR12.h"
+ #endif
+ #include "xf86DDC.h"
+ #include "edid.h"
++#include "xf86Cursor.h"
++#include "xf86RamDac.h"
++#include "BT.h"
++#include "IBM.h"
++#include "TI.h"
+
+ #ifndef HAS_GLIBC_SIGSETJMP
+ #if defined(setjmp) && defined(__GNU_LIBRARY__) && \
+@@ -1255,4 +1260,50 @@ #endif
+ SYMFUNC(xf86I2CWriteRead)
+ SYMFUNC(xf86I2CWriteVec)
+ SYMFUNC(xf86I2CWriteWord)
++
++ /* ramdac/xf86RamDac.c */
++ SYMFUNC(RamDacCreateInfoRec)
++ SYMFUNC(RamDacHelperCreateInfoRec)
++ SYMFUNC(RamDacDestroyInfoRec)
++ SYMFUNC(RamDacHelperDestroyInfoRec)
++ SYMFUNC(RamDacInit)
++ SYMFUNC(RamDacHandleColormaps)
++ SYMFUNC(RamDacFreeRec)
++ SYMFUNC(RamDacGetHWIndex)
++ SYMVAR(RamDacHWPrivateIndex)
++ SYMVAR(RamDacScreenPrivateIndex)
++
++ /* ramdac/xf86Cursor.c */
++ SYMFUNC(xf86InitCursor)
++ SYMFUNC(xf86CreateCursorInfoRec)
++ SYMFUNC(xf86DestroyCursorInfoRec)
++ SYMFUNC(xf86ForceHWCursor)
++
++ /* ramdac/BT.c */
++ SYMFUNC(BTramdacProbe)
++ SYMFUNC(BTramdacSave)
++ SYMFUNC(BTramdacRestore)
++ SYMFUNC(BTramdacSetBpp)
++
++ /* ramdac/IBM.c */
++ SYMFUNC(IBMramdacProbe)
++ SYMFUNC(IBMramdacSave)
++ SYMFUNC(IBMramdacRestore)
++ SYMFUNC(IBMramdac526SetBpp)
++ SYMFUNC(IBMramdac640SetBpp)
++ SYMFUNC(IBMramdac526CalculateMNPCForClock)
++ SYMFUNC(IBMramdac640CalculateMNPCForClock)
++ SYMFUNC(IBMramdac526HWCursorInit)
++ SYMFUNC(IBMramdac640HWCursorInit)
++ SYMFUNC(IBMramdac526SetBppWeak)
++
++ /* ramdac/TI.c */
++ SYMFUNC(TIramdacCalculateMNPForClock)
++ SYMFUNC(TIramdacProbe)
++ SYMFUNC(TIramdacSave)
++ SYMFUNC(TIramdacRestore)
++ SYMFUNC(TIramdac3026SetBpp)
++ SYMFUNC(TIramdac3030SetBpp)
++ SYMFUNC(TIramdacHWCursorInit)
++ SYMFUNC(TIramdacLoadPalette)
+ };
--- a/open-src/xserver/xorg/sun-apm.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/sun-apm.patch Tue Jul 31 15:09:29 2007 -0700
@@ -15,7 +15,7 @@
--- configure.ac
+++ configure.ac
-@@ -1220,6 +1220,8 @@ # ])
+@@ -1226,6 +1226,8 @@ # ])
fi
if test "${OS_MINOR}" -lt 8 ; then
solaris_usl_console="yes"
--- a/open-src/xserver/xorg/sun-loginfo.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/sun-loginfo.patch Tue Jul 31 15:09:29 2007 -0700
@@ -26,9 +26,9 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
-diff -urp -x '*~' hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86Init.c
---- hw/xfree86/common/xf86Init.c 2006-12-21 10:50:46.000000000 -0800
-+++ hw/xfree86/common/xf86Init.c 2006-12-21 14:22:33.881433000 -0800
+diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86Init.c
+--- hw/xfree86/common/xf86Init.c 2006-11-30 17:40:10.000000000 -0800
++++ hw/xfree86/common/xf86Init.c 2007-07-30 18:34:21.833819000 -0700
@@ -103,6 +103,7 @@ static void xf86PrintMarkers(void);
static void xf86PrintDefaultModulePath(void);
static void xf86PrintDefaultLibraryPath(void);
@@ -128,3 +128,31 @@
+ }
+ }
+}
+diff -urp -x '*~' -x '*.orig' hw/xfree86/loader/loadmod.c hw/xfree86/loader/loadmod.c
+--- hw/xfree86/loader/loadmod.c 2007-04-16 09:37:51.000000000 -0700
++++ hw/xfree86/loader/loadmod.c 2007-07-30 18:34:21.915061000 -0700
+@@ -869,7 +869,7 @@ doLoadModule(const char *module, const c
+ for (cim = compiled_in_modules; *cim; cim++)
+ if (!strcmp (module, *cim))
+ {
+- xf86MsgVerb(X_INFO, 0, "Module already built-in\n");
++ xf86MsgVerb(X_INFO, 0, "Module \"%s\" already built-in\n", module);
+ return (ModuleDescPtr) 1;
+ }
+
+@@ -1310,6 +1310,15 @@ LoaderErrorMsg(const char *name, const c
+ default:
+ msg = "unknown error";
+ }
++#ifdef SUNSOFT
++ /* We don't ship fbdev in Solaris, xtsol is only required on Trusted (TX)
++ systems, so it's not an error if either of them are not found */
++ if ( (errmaj == LDR_NOENT) &&
++ ((strcmp(modname, "xtsol") == 0) || (strcmp(modname, "fbdev") == 0)))
++ {
++ type = X_INFO;
++ }
++#endif
+ if (name)
+ xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n",
+ name, modname, msg, errmin);
--- a/open-src/xserver/xorg/xephyr.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/xephyr.patch Tue Jul 31 15:09:29 2007 -0700
@@ -1,66 +1,3 @@
-commit 5dcad9e9d7d9993d65f989219bee94a060bbf476
-Author: Alan Coopersmith <[email protected]>
-Date: Fri Feb 2 14:44:55 2007 -0800
-
- Fix bus error on startup in 64-bit Xephyr
-
- hostx_get_visual_masks takes unsigned long * arguments, but was being
- passed pointers to CARD32's.
-
-diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
-index 7db8675..2ca51c3 100644
---- a/hw/kdrive/ephyr/ephyr.c
-+++ b/hw/kdrive/ephyr/ephyr.c
-@@ -81,7 +81,8 @@ Bool
- ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv)
- {
- int width = 640, height = 480;
--
-+ unsigned long redMask, greenMask, blueMask;
-+
- if (hostx_want_screen_size(&width, &height)
- || !screen->width || !screen->height)
- {
-@@ -133,30 +134,24 @@ ephyrScreenInitialize (KdScreenInfo *scr
- {
- screen->fb[0].depth = 15;
- screen->fb[0].bitsPerPixel = 16;
--
-- hostx_get_visual_masks (&screen->fb[0].redMask,
-- &screen->fb[0].greenMask,
-- &screen->fb[0].blueMask);
--
- }
- else if (screen->fb[0].depth <= 16)
- {
- screen->fb[0].depth = 16;
- screen->fb[0].bitsPerPixel = 16;
--
-- hostx_get_visual_masks (&screen->fb[0].redMask,
-- &screen->fb[0].greenMask,
-- &screen->fb[0].blueMask);
- }
- else
- {
- screen->fb[0].depth = 24;
- screen->fb[0].bitsPerPixel = 32;
--
-- hostx_get_visual_masks (&screen->fb[0].redMask,
-- &screen->fb[0].greenMask,
-- &screen->fb[0].blueMask);
- }
-+
-+ hostx_get_visual_masks (&redMask, &greenMask, &blueMask);
-+
-+ screen->fb[0].redMask = (Pixel) redMask;
-+ screen->fb[0].greenMask = (Pixel) greenMask;
-+ screen->fb[0].blueMask = (Pixel) blueMask;
-+
- }
-
- scrpriv->randr = screen->randr;
-
-
--- xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c~ 2007-01-22 21:39:15.000000000 -0800
+++ xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c 2007-02-02 16:03:09.840426000 -0800
@@ -40,6 +40,7 @@
--- a/open-src/xserver/xorg/xevie.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/xevie.patch Tue Jul 31 15:09:29 2007 -0700
@@ -26,9 +26,9 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
-diff -urp -x '*~' hw/xfree86/dixmods/extmod/modinit.c hw/xfree86/dixmods/extmod/modinit.c
---- hw/xfree86/dixmods/extmod/modinit.c 2006-11-13 16:59:40.000000000 -0800
-+++ hw/xfree86/dixmods/extmod/modinit.c 2006-12-21 14:23:45.966023000 -0800
+diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/extmod/modinit.c hw/xfree86/dixmods/extmod/modinit.c
+--- hw/xfree86/dixmods/extmod/modinit.c 2006-06-06 10:13:53.000000000 -0700
++++ hw/xfree86/dixmods/extmod/modinit.c 2007-07-30 18:35:59.381657000 -0700
@@ -198,6 +198,15 @@ static ExtensionModule extensionModules[
NULL
},
@@ -45,9 +45,9 @@
{ /* DON'T delete this entry ! */
NULL,
NULL,
-diff -urp -x '*~' hw/xfree86/dixmods/extmod/modinit.h hw/xfree86/dixmods/extmod/modinit.h
---- hw/xfree86/dixmods/extmod/modinit.h 2006-11-13 16:59:40.000000000 -0800
-+++ hw/xfree86/dixmods/extmod/modinit.h 2006-12-21 14:23:45.966928000 -0800
+diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/extmod/modinit.h hw/xfree86/dixmods/extmod/modinit.h
+--- hw/xfree86/dixmods/extmod/modinit.h 2006-10-24 17:25:19.000000000 -0700
++++ hw/xfree86/dixmods/extmod/modinit.h 2007-07-30 18:35:59.382387000 -0700
@@ -149,3 +149,9 @@ extern void PanoramiXExtensionInit(int a
#if 1
extern void XkbExtensionInit(INITARGS);
@@ -58,10 +58,10 @@
+# define _XEVIE_SERVER_
+# include <X11/extensions/Xeviestr.h>
+#endif
-diff -urp -x '*~' os/utils.c os/utils.c
---- os/utils.c 2006-12-21 14:23:30.188844000 -0800
-+++ os/utils.c 2006-12-21 14:23:45.969992000 -0800
-@@ -216,9 +216,9 @@ _X_EXPORT Bool noXagExtension = FALSE;
+diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
+--- os/utils.c 2007-07-30 18:35:42.383397000 -0700
++++ os/utils.c 2007-07-30 18:35:59.387632000 -0700
+@@ -200,9 +200,9 @@ _X_EXPORT Bool noXagExtension = FALSE;
_X_EXPORT Bool noXCMiscExtension = FALSE;
#endif
#ifdef XEVIE
--- a/open-src/xserver/xorg/xorgconfig.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/xorgconfig.patch Tue Jul 31 15:09:29 2007 -0700
@@ -111,7 +111,7 @@
}
switch (c) {
case 0 :
-@@ -1940,16 +1988,28 @@
+@@ -1940,16 +1988,30 @@
" EndSubSection\n"
"\n"
"# This loads the font modules\n"
@@ -133,6 +133,8 @@
+" Load \"IA\"\n"
+"# This loads the GLX module\n"
+" Load \"glx\"\n"
++"# This loads the Solaris Trusted Extensions module if it is installed\n"
++" Load \"xtsol\"\n"
+#else
"# This loads the GLX module\n"
"# Load \"glx\"\n"
--- a/open-src/xserver/xorg/xtsol.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/xtsol.patch Tue Jul 31 15:09:29 2007 -0700
@@ -54,9 +54,9 @@
CallbackListPtr SecurityValidateGroupCallback = NULL; /* see security.h */
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2007-01-24 20:08:20.616515000 -0800
-+++ configure.ac 2007-01-24 20:08:34.852663000 -0800
-@@ -113,6 +113,10 @@ AC_CHECK_FUNC([mmap], AC_DEFINE(HAS_MMAP
+--- configure.ac 2007-07-30 18:33:49.575258000 -0700
++++ configure.ac 2007-07-30 18:34:04.958972000 -0700
+@@ -127,6 +127,10 @@ AC_CHECK_FUNC([mmap], AC_DEFINE(HAS_MMAP
dnl Find the math libary
AC_CHECK_LIB(m, sqrt)
@@ -67,7 +67,7 @@
AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
dnl AGPGART headers
-@@ -1859,3 +1863,6 @@ xorg-server.pc
+@@ -1868,3 +1872,6 @@ xorg-server.pc
# Add Sun IA extension
AC_OUTPUT([IA/Makefile])
--- a/packages/SUNWxorg-server/prototype_com Mon Jul 30 15:57:04 2007 -0700
+++ b/packages/SUNWxorg-server/prototype_com Tue Jul 31 15:09:29 2007 -0700
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# ident "@(#)prototype_com 1.24 07/07/18 SMI"
+# ident "@(#)prototype_com 1.25 07/07/31 SMI"
#
# X.Org Foundation X server for Solaris
@@ -81,19 +81,11 @@
!search $HOME/$XSERVERMODDIR
d none X11/lib/modules 0755 root bin
f none X11/lib/modules/libafb.so 0755 root bin
-#f none X11/lib/modules/libcfb.so 0755 root bin
-#f none X11/lib/modules/libcfb16.so 0755 root bin
-#f none X11/lib/modules/libcfb32.so 0755 root bin
-f none X11/lib/modules/libddc.so 0755 root bin
f none X11/lib/modules/libexa.so 0755 root bin
f none X11/lib/modules/libfb.so 0755 root bin
-f none X11/lib/modules/libi2c.so 0755 root bin
f none X11/lib/modules/libint10.so 0755 root bin
-#f none X11/lib/modules/liblayer.so 0755 root bin
f none X11/lib/modules/libmfb.so 0755 root bin
f none X11/lib/modules/libpcidata.so 0755 root bin
-#f none X11/lib/modules/librac.so 0755 root bin
-f none X11/lib/modules/libramdac.so 0755 root bin
f none X11/lib/modules/libscanpci.so 0755 root bin
f none X11/lib/modules/libshadow.so 0755 root bin
f none X11/lib/modules/libshadowfb.so 0755 root bin
@@ -163,7 +155,3 @@
f none X11/lib/modules/input/kbd_drv.so 0755 root bin
f none X11/lib/modules/input/mouse_drv.so 0755 root bin
f none X11/lib/modules/input/void_drv.so 0755 root bin
-
-!search $HOME/$XSERVERMODDIR/linux
-d none X11/lib/modules/linux 0755 root bin
-f none X11/lib/modules/linux/libfbdevhw.so 0755 root bin
--- a/packages/SUNWxorg-server/prototype_i386 Mon Jul 30 15:57:04 2007 -0700
+++ b/packages/SUNWxorg-server/prototype_i386 Tue Jul 31 15:09:29 2007 -0700
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# ident "@(#)prototype_i386 1.11 07/07/24 SMI"
+# ident "@(#)prototype_i386 1.12 07/07/31 SMI"
#
# X.Org Foundation X server for Solaris
@@ -63,19 +63,11 @@
!search $HOME/lib/modules/amd64
d none X11/lib/modules/amd64 0755 root bin
f none X11/lib/modules/amd64/libafb.so 0755 root bin
-#f none X11/lib/modules/amd64/libcfb.so 0755 root bin
-#f none X11/lib/modules/amd64/libcfb16.so 0755 root bin
-#f none X11/lib/modules/amd64/libcfb32.so 0755 root bin
-f none X11/lib/modules/amd64/libddc.so 0755 root bin
f none X11/lib/modules/amd64/libexa.so 0755 root bin
f none X11/lib/modules/amd64/libfb.so 0755 root bin
-f none X11/lib/modules/amd64/libi2c.so 0755 root bin
f none X11/lib/modules/amd64/libint10.so 0755 root bin
-#f none X11/lib/modules/amd64/liblayer.so 0755 root bin
f none X11/lib/modules/amd64/libmfb.so 0755 root bin
f none X11/lib/modules/amd64/libpcidata.so 0755 root bin
-#f none X11/lib/modules/amd64/librac.so 0755 root bin
-f none X11/lib/modules/amd64/libramdac.so 0755 root bin
f none X11/lib/modules/amd64/libscanpci.so 0755 root bin
f none X11/lib/modules/amd64/libshadow.so 0755 root bin
f none X11/lib/modules/amd64/libshadowfb.so 0755 root bin
@@ -156,8 +148,3 @@
f none X11/lib/modules/input/amd64/void_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/vmmouse_drv.so 0755 root bin
#f none X11/lib/modules/input/amd64/wacom_drv.so 0755 root bin
-
-!search $HOME/lib/modules/amd64/linux
-d none X11/lib/modules/linux/amd64 0755 root bin
-f none X11/lib/modules/linux/amd64/libfbdevhw.so 0755 root bin
-