================================
xorg-server:source=1.1.1-1
cvc rdiff xorg-server -1 /[EMAIL PROTECTED]:1-devel/1.1.1-1
================================
1.1.1-1 Ken VanDine ([EMAIL PROTECTED]) Sun Jul 30 22:56:40 2006
Merged from fl:devel
xorg-server-1.1.1.tar.bz2: new
xorg-redhat-die-ugly-pattern-die-die-die.patch: new
--- /dev/null
+++ xorg-redhat-die-ugly-pattern-die-die-die.patch
@@ -0,0 +18 @@
+$Id:$
+
+Remove the default root window grey stipple pattern, replacing it with
+blackness.
+
+--- dix/window.c.die-ugly-pattern-die-die-die Tue Feb 12 16:33:04 2002
++++ dix/window.c Tue Feb 12 16:45:32 2002
+@@ -119,8 +119,8 @@
+ *
+ ******/
+
+-static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11};
+-static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88};
++static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00};
++static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00};
+
+ int screenIsSaved = SCREEN_SAVER_OFF;
+
xorg-x11-server-1.0.1-fpic-libxf86config.patch: new
--- /dev/null
+++ xorg-x11-server-1.0.1-fpic-libxf86config.patch
@@ -0,0 +11 @@
+--- xorg-server-1.0.1/hw/xfree86/parser/Makefile.am.xf86configfpic
2006-03-06 13:57:45.000000000 -0500
++++ xorg-server-1.0.1/hw/xfree86/parser/Makefile.am 2006-03-06
13:59:11.000000000 -0500
+@@ -23,7 +23,7 @@
+ DRI.c \
+ Extensions.c
+
+-AM_CFLAGS = $(XORG_CFLAGS)
++AM_CFLAGS = $(XORG_CFLAGS) -fPIC
+
+ EXTRA_DIST = \
+ Configint.h \
xserver.pamd: new
--- /dev/null
+++ xserver.pamd
@@ -0,0 +4 @@
+#%PAM-1.0
+auth sufficient pam_rootok.so
+auth required pam_console.so
+account required pam_permit.so
xserver-1.0.0-parser-add-missing-headers-to-sdk.patch: new
--- /dev/null
+++ xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
@@ -0,0 +8 @@
+--- hw/xfree86/parser/Makefile.am.parser-add-missing-headers-to-sdk
2005-12-20 16:05:34.000000000 -0500
++++ hw/xfree86/parser/Makefile.am 2005-12-20 16:06:57.000000000 -0500
+@@ -32,3 +32,5 @@
+ xf86Parser.h \
+ xf86tokens.h \
+ cpconfig.c
++
++sdk_HEADERS = xf86Parser.h xf86Optrec.h
fdo4320-xaaPict.c.patch: new
--- /dev/null
+++ fdo4320-xaaPict.c.patch
@@ -0,0 +33 @@
+diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c
+index 0391ed4..a7acf45 100644
+--- a/hw/xfree86/xaa/xaaPict.c
++++ b/hw/xfree86/xaa/xaaPict.c
+@@ -513,12 +513,22 @@ XAAComposite (CARD8 op,
+ XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+ XAA_RENDER_PROLOGUE(pScreen, Composite);
+
+- if((op == PictOpSrc) && !pMask && infoRec->pScrn->vtSema &&
+- infoRec->ScreenToScreenBitBlt &&
+- pSrc->pDrawable &&
+- DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&
+- DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&
+- !pSrc->transform && !pSrc->repeat && (pSrc->format == pDst->format))
++ if(!pMask && infoRec->pScrn->vtSema &&
++ infoRec->ScreenToScreenBitBlt &&
++ pSrc->pDrawable &&
++ DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&
++ DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&
++ !pSrc->transform &&
++ (!pSrc->repeat || (xSrc >= 0 && ySrc >= 0 &&
++ xSrc+width<=pSrc->pDrawable->width &&
++ ySrc+height<=pSrc->pDrawable->height)) &&
++ ((op == PictOpSrc &&
++ ((pSrc->format==pDst->format) ||
++ (pSrc->format==PICT_a8r8g8b8 && pDst->format==PICT_x8r8g8b8) ||
++ (pSrc->format==PICT_a8b8g8r8 && pDst->format==PICT_x8b8g8r8))) ||
++ (op == PictOpOver && !pSrc->alphaMap && !pDst->alphaMap &&
++ pSrc->format==pDst->format &&
++ (pSrc->format==PICT_x8r8g8b8 || pSrc->format==PICT_x8b8g8r8))))
+ {
+ XAACompositeSrcCopy(pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height);
+ } else if(!pSrc->pDrawable || (pMask && !pMask->pDrawable) ||
MesaLib-6.5.tar.bz2: new
xorg-server.recipe: new
--- /dev/null
+++ xorg-server.recipe
@@ -0,0 +123 @@
+#
+# Copyright (c) 2005-2006 rPath, Inc.
+# This file is distributed under the terms of the MIT License.
+# A copy is available at http://www.rpath.com/permanent/mit-license.html
+#
+
+loadSuperClass('xorgpackage.recipe')
+class XorgServer(XorgPackageRecipe):
+ name = 'xorg-server'
+ version = '1.1.1'
+ component = 'xserver'
+
+ Flags.dmx = True
+ Flags.dri = True
+ Flags.xnest = True
+
+ # XXX: ld dies trying to link xorgcfg without libXext, need to make sure
+ # configure checks for it
+ # perl:lib needed to satisfy "perl: File::Glob" for /usr/bin/getconfig.pl
+ buildRequires = [ 'flex:runtime', 'freetype:devel', 'libICE:devel',
+ 'libSM:devel', 'libXaw:devel', 'libXext:devel', 'libXfont:devel',
+ 'libXmu:devel', 'libXpm:devel', 'libXt:devel', 'libXxf86misc:devel',
+ 'libXxf86vm:devel', 'libfontenc:devel', 'liblbxutil:devellib',
+ 'libxkbfile:devel', 'libxkbui:devel', 'ncurses:devel', 'perl:lib',
+ 'perl:runtime', 'xtrans:devel', 'zlib:devel' ]
+
+ protoBuildRequires = [ 'bigreqsproto:devel', 'compositeproto:devel',
+ 'damageproto:devel', 'evieext:devel', 'fixesproto:devel',
+ 'fontsproto:devel', 'inputproto:devel', 'randrproto:devel',
+ 'recordproto:devel', 'renderproto:devel', 'resourceproto:devel',
+ 'scrnsaverproto:devel', 'trapproto:devel', 'videoproto:devel',
+ 'xcmiscproto:devel', 'xextproto:devel', 'xf86bigfontproto:devel',
+ 'xf86dgaproto:devel', 'xf86miscproto:devel', 'xf86vidmodeproto:devel',
+ 'xineramaproto:devel', 'xproto:devel' ]
+
+ buildRequires.extend(protoBuildRequires)
+
+ # XXX: can go away when the libxf86config parser patches go away
+ buildRequires.extend([ 'autoconf:runtime', 'automake:runtime',
+ 'libtool:runtime', 'util-macros:devel' ])
+
+ # XXX: we don't support xprint
+ extraConfig = ' --disable-xprint'
+
+ if Flags.dmx:
+ buildRequires.extend([ 'libXi:devel', 'libXrender:devel',
+ 'libXres:devel', 'libXtst:devellib', 'libdmx:devel' ])
+ else:
+ extraConfig += ' --disable-dmx'
+
+ if Flags.dri:
+ buildRequires.extend([ 'Mesa:devel', 'glproto:devel', 'libdrm:devel',
+ 'xf86driproto:devel' ])
+
+ if not Flags.xnest:
+ extraConfig += ' --disable-xnest'
+
+ def setup(r):
+ r.macros.osname = "'Foresight Desktop Linux'"
+ r.macros.vendor = "'Foresight'"
+ r.extraConfig += ' --with-os-name=%(osname)s --with-vendor=%(vendor)s
--enable-install-libxf86config'
+
+ XorgPackageRecipe.setup(r)
+
+ def unpack(r):
+ # pulled from Fedora CVS (xorg-x11-xdm, rev. 1.1)
+ r.addSource('xserver.pamd',
+ dest='%(sysconfdir)s/pam.d/xserver', mode=00644)
+
+ # need to have archive before we apply patches to it
+ XorgPackageRecipe.unpack(r)
+
+ # according to http://xorg.freedesktop.org/wiki/ModularDevelopersGuide
+ # we need the Mesa source to build GLX support
+ r.macros.mesaVersion = '6.5'
+
r.addArchive('http://easynews.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%(mesaVersion)s.tar.bz2',
use=Flags.dri)
+
+ if Flags.dri:
+ r.extraConfig += ( ' --enable-dri'
+ ' --enable-glx-tls'
+ '
--with-mesa-source=%(builddir)s/../Mesa-%(mesaVersion)s'
+ ' --with-dri-driver-path=%(libdir)s/dri' )
+ else:
+ r.extraConfig += ' --disable-dri'
+
+ # pulled from Fedora CVS (xorg-x11-server, rev. 1.1)
+ r.addPatch('xorg-redhat-die-ugly-pattern-die-die-die.patch', level=0)
+
+ # pulled from xorg-xserver git; see fd.o BZ #4320
+ # should be in xorg-server-1.2
+ r.addPatch('fdo4320-xaaPict.c.patch')
+
+ # XXX: the next two patches require running r.Automake()
+ # The patches are for the libxf86config parser used by pyxf86config
+ # See RH BZ #173084 & #181292, respectively
+ # XXX: really need to get pushed upstream
+ r.addPatch('xserver-1.0.0-parser-add-missing-headers-to-sdk.patch',
level=0)
+ r.addPatch('xorg-x11-server-1.0.1-fpic-libxf86config.patch')
+ r.addPatch('xorg-x11-server-1.0.1-Red-Hat-extramodes.patch')
+
+
+ r.Automake()
+
+ def install(r):
+ XorgPackageRecipe.install(r)
+
+ r.SetModes('%(bindir)s/Xorg', 04611)
+
+ # copied from xorg-x11 recipe; is this for consolehelper?
+ r.MakeDirs('%(sysconfdir)s/security/console.apps/')
+ r.Run('touch %(destdir)s%(sysconfdir)s/security/console.apps/xserver')
+
+
+ # make xorg.conf an InitialContents file so it's managed locally, but
+ # removed when xorg-server is
+ r.MakeDirs('%(sysconfdir)s/X11')
+ r.Run('touch %(destdir)s%(sysconfdir)s/X11/xorg.conf')
+ r.InitialContents('%(sysconfdir)s/X11/xorg.conf')
+
+ # Install the vesamodes and extramodes files to let our install/config
tools
+ # be able to parse the same modelist as the X server uses (rhpxl).
+ r.Install('hw/xfree86/common/vesamodes','%(datadir)s/xorg/vesamodes')
+ r.Install('hw/xfree86/common/extramodes','%(datadir)s/xorg/extramodes')
xorg-x11-server-1.0.1-Red-Hat-extramodes.patch: new
--- /dev/null
+++ xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
@@ -0,0 +137 @@
+--- xorg-server-1.0.1/hw/xfree86/common/extramodes.Red-Hat-extramodes
2004-04-23 15:53:57.000000000 -0400
++++ xorg-server-1.0.1/hw/xfree86/common/extramodes 2006-03-06
15:09:19.000000000 -0500
+@@ -10,14 +10,23 @@
+ # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
+ ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync
+vsync
+
++# 1152x864 @ 85Hz (Red Hat custom modeline)
++ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync
-vsync
++
+ # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
+ ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync
+vsync
+
++# 1400x1050 @ 70Hz (Red Hat custom modeline) hsync: 76.8kHz
++ModeLine "1400x1050" 151.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync
+vsync
++
+ # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
+ ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync
+vsync
+
+-# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz
+-Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync
-vsync
++# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz
++ModeLine "1400x1050" 184.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync
+vsync
++
++# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50
KHz
++Modeline "1920x1200" 230.0 1920 1936 2096 2528 1200 1201 1204 1250 -HSync
-VSync
+
+ # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
+ Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync
+vsync
+@@ -31,3 +40,108 @@
+ # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
+ Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync
+vsync
+
++# 848x480 @ 60.00 Hz (GTF) hsync: 29.82 kHz; pclk: 31.49 MHz
++Modeline "848x480" 31.49 848 864 952 1056 480 481 484 497 -HSync +Vsync
++
++# 848x480 @ 70.00 Hz (GTF) hsync: 35.00 kHz; pclk: 37.52 MHz
++Modeline "848x480" 37.52 848 872 960 1072 480 481 484 500 -HSync +Vsync
++
++# 848x480 @ 75.00 Hz (GTF) hsync: 37.65 kHz; pclk: 40.96 MHz
++Modeline "848x480" 40.96 848 880 968 1088 480 481 484 502 -HSync +Vsync
++
++# 848x480 @ 85.00 Hz (GTF) hsync: 42.92 kHz; pclk: 47.39 MHz
++Modeline "848x480" 47.39 848 888 976 1104 480 481 484 505 -HSync +Vsync
++
++# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
++Modeline "1152x864" 81.62 1152 1216 1336 1520 864 865 868 895 -HSync
+Vsync
++
++# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz
++Modeline "1152x864" 96.77 1152 1224 1344 1536 864 865 868 900 -HSync
+Vsync
++
++# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz
++Modeline "1152x864" 104.99 1152 1224 1352 1552 864 865 868 902 -HSync
+Vsync
++
++# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
++Modeline "1152x864" 119.65 1152 1224 1352 1552 864 865 868 907 -HSync
+Vsync
++
++# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz
++Modeline "1400x1050" 145.06 1400 1496 1648 1896 1050 1051 1054 1093
-HSync +Vsync
++
++# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
++Modeline "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103
-HSync +Vsync
++
++# 1280x800 @ 60.00 Hz (GTF) hsync: 49.68 kHz; pclk: 83.46 MHz
++Modeline "1280x800" 83.46 1280 1344 1480 1680 800 801 804 828 -HSync
+Vsync
++
++# 1280x800 @ 70.00 Hz (GTF) hsync: 58.31 kHz; pclk: 98.89 MHz
++Modeline "1280x800" 98.89 1280 1352 1488 1696 800 801 804 833 -HSync
+Vsync
++
++# 1280x800 @ 75.00 Hz (GTF) hsync: 62.62 kHz; pclk: 107.21 MHz
++Modeline "1280x800" 107.21 1280 1360 1496 1712 800 801 804 835 -HSync
+Vsync
++
++# 1280x800 @ 85.00 Hz (GTF) hsync: 71.40 kHz; pclk: 123.38 MHz
++Modeline "1280x800" 123.38 1280 1368 1504 1728 800 801 804 840 -HSync
+Vsync
++
++# 1680x1050 @ 60.00 Hz (GTF) hsync: 65.22 kHz; pclk: 147.14 MHz
++Modeline "1680x1050" 147.14 1680 1784 1968 2256 1050 1051 1054 1087
-HSync +Vsync
++
++# 1680x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 173.83 MHz
++Modeline "1680x1050" 173.83 1680 1792 1976 2272 1050 1051 1054 1093
-HSync +Vsync
++
++# 1680x1050 @ 75.00 Hz (GTF) hsync: 82.20 kHz; pclk: 188.07 MHz
++Modeline "1680x1050" 188.07 1680 1800 1984 2288 1050 1051 1054 1096
-HSync +Vsync
++
++# 1680x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 214.51 MHz
++Modeline "1680x1050" 214.51 1680 1800 1984 2288 1050 1051 1054 1103
-HSync +Vsync
++
++# 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz
++Modeline "1280x720" 74.48 1280 1336 1472 1664 720 721 724 746 -HSync
+Vsync
++
++# 1280x720 @ 70.00 Hz (GTF) hsync: 52.50 kHz; pclk: 89.04 MHz
++Modeline "1280x720" 89.04 1280 1352 1488 1696 720 721 724 750 -HSync
+Vsync
++
++# 1280x720 @ 75.00 Hz (GTF) hsync: 56.40 kHz; pclk: 95.65 MHz
++Modeline "1280x720" 95.65 1280 1352 1488 1696 720 721 724 752 -HSync
+Vsync
++
++# 1280x720 @ 85.00 Hz (GTF) hsync: 64.26 kHz; pclk: 110.01 MHz
++Modeline "1280x720" 110.01 1280 1360 1496 1712 720 721 724 756 -HSync
+Vsync
++
++# 1280x768 @ 60.00 Hz (GTF) hsync: 47.70 kHz; pclk: 80.14 MHz
++Modeline "1280x768" 80.14 1280 1344 1480 1680 768 769 772 795 -HSync
+Vsync
++
++# 1280x768 @ 70.00 Hz (GTF) hsync: 56.00 kHz; pclk: 94.98 MHz
++Modeline "1280x768" 94.98 1280 1352 1488 1696 768 769 772 800 -HSync
+Vsync
++
++# 1280x768 @ 75.00 Hz (GTF) hsync: 60.15 kHz; pclk: 102.98 MHz
++Modeline "1280x768" 102.98 1280 1360 1496 1712 768 769 772 802 -HSync
+Vsync
++
++# 1280x768 @ 85.00 Hz (GTF) hsync: 68.60 kHz; pclk: 118.53 MHz
++Modeline "1280x768" 118.53 1280 1368 1504 1728 768 769 772 807 -HSync
+Vsync
++
++# 1920x1200 @ 60.00 Hz (GTF) hsync: 74.52 kHz; pclk: 193.16 MHz
++Modeline "1920x1200" 193.16 1920 2048 2256 2592 1200 1201 1204 1242
-HSync +Vsync
++
++# 1920x1200 @ 70.00 Hz (GTF) hsync: 87.43 kHz; pclk: 228.02 MHz
++Modeline "1920x1200" 228.02 1920 2056 2264 2608 1200 1201 1204 1249
-HSync +Vsync
++
++# 1920x1200 @ 75.00 Hz (GTF) hsync: 93.97 kHz; pclk: 246.59 MHz
++Modeline "1920x1200" 246.59 1920 2064 2272 2624 1200 1201 1204 1253
-HSync +Vsync
++
++# 1920x1200 @ 85.00 Hz (GTF) hsync: 107.10 kHz; pclk: 282.74 MHz
++Modeline "1920x1200" 282.74 1920 2072 2280 2640 1200 1201 1204 1260
-HSync +Vsync
++
++# 2560x1600 @ 60.00 Hz (GTF) hsync: 99.36 kHz; pclk: 348.16 MHz
++Modeline "2560x1600" 348.16 2560 2752 3032 3504 1600 1601 1604 1656
-HSync +Vsync
++
++# 2560x1600 @ 70.00 Hz (GTF) hsync: 116.55 kHz; pclk: 410.26 MHz
++Modeline "2560x1600" 410.26 2560 2760 3040 3520 1600 1601 1604 1665
-HSync +Vsync
++
++# 2560x1600 @ 75.00 Hz (GTF) hsync: 125.25 kHz; pclk: 442.88 MHz
++Modeline "2560x1600" 442.88 2560 2768 3048 3536 1600 1601 1604 1670
-HSync +Vsync
++
++# 2560x1600 @ 85.00 Hz (GTF) hsync: 142.80 kHz; pclk: 507.23 MHz
++Modeline "2560x1600" 507.23 2560 2768 3056 3552 1600 1601 1604 1680
-HSync +Vsync
++
++# 1600x1024 for SGI 1600 SW
++ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync
+Vsync
++
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
