X Strike Force XFree86 SVN commit: rev 713 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-10-24 17:36:18 -0500 (Fri, 24 Oct 2003)
New Revision: 713
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_post430.diff
branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff
branches/4.3.0/sid/debian/patches/056_i810_make_i830_usable.diff
Log:
Grab fixes to upstream CVS xf-4_3-branch since last pull.
- debian/patches/000_post430.diff:
+ (xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,
xc/programs/xdm/{genauth.c,prngc.c}):
Grab licenses clarifications from trunk. (Matthieu Herrb)
+ (xc/programs/Xserver/hw/xfree86/doc/LICENSE):
update formatted docs (Matthieu Herrb)
+ (xc/programs/Xserver/hw/xfree86/drivers/i810/{common.h,i810.h,
i810.man,i830.h,i830_cursor.c,i830_dri.c,i830_dri.h,i830_driver.c,
i830_memory.c,i830_video.c}):
Fix some i830+ VT switch/exit crashes (David Dawes, Egbert Eich).
- debian/patches/002_xdm_fixes.diff: resynced
- debian/patches/056_i810_make_i830_usable.diff: resynced
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-10-24 20:47:33 UTC (rev 712)
+++ branches/4.3.0/sid/debian/changelog 2003-10-24 22:36:18 UTC (rev 713)
@@ -1,3 +1,21 @@
+xfree86 (4.3.0-0pre1v5) experimental; urgency=low
+
+ * Grab fixes to upstream CVS xf-4_3-branch since last pull.
+ - debian/patches/000_post430.diff:
+ + (xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,
+ xc/programs/xdm/{genauth.c,prngc.c}):
+ Grab licenses clarifications from trunk. (Matthieu Herrb)
+ + (xc/programs/Xserver/hw/xfree86/doc/LICENSE):
+ update formatted docs (Matthieu Herrb)
+ + (xc/programs/Xserver/hw/xfree86/drivers/i810/{common.h,i810.h,
+ i810.man,i830.h,i830_cursor.c,i830_dri.c,i830_dri.h,i830_driver.c,
+ i830_memory.c,i830_video.c}):
+ Fix some i830+ VT switch/exit crashes (David Dawes, Egbert Eich).
+ - debian/patches/002_xdm_fixes.diff: resynced
+ - debian/patches/056_i810_make_i830_usable.diff: resynced
+
+ -- Branden Robinson <branden@debian.org> Fri, 24 Oct 2003 17:22:13 -0500
+
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
* Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi]
Modified: branches/4.3.0/sid/debian/patches/000_post430.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_post430.diff 2003-10-24 20:47:33 UTC (rev 712)
+++ branches/4.3.0/sid/debian/patches/000_post430.diff 2003-10-24 22:36:18 UTC (rev 713)
@@ -278,6 +278,19 @@
1008. Fixed definititon of UseInstalledOnCrossCompile so that it never is
undefined (Harlod L. Hunt II).
+(xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,
+ xc/programs/xdm/{genauth.c,prngc.c}):
+ Grab licenses clarifications from trunk. (Matthieu Herrb)
+
+(xc/programs/Xserver/hw/xfree86/doc/LICENSE):
+ update formatted docs (Matthieu Herrb)
+
+(xc/programs/Xserver/hw/xfree86/drivers/i810/{common.h,i810.h,i810.man,
+ i830.h,i830_cursor.c,i830_dri.c,
+ i830_dri.h,i830_driver.c,
+ i830_memory.c,i830_video.c}):
+ Fix some i830+ VT switch/exit crashes (David Dawes, Egbert Eich).
+
Index: xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvs/xc/config/cf/NetBSD.cf,v
@@ -2443,16 +2456,17 @@
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/CHANGELOG,v
retrieving revision 3.2588
-retrieving revision 3.2588.2.29
-diff -u -r3.2588 -r3.2588.2.29
+retrieving revision 3.2588.2.31
+diff -u -r3.2588 -r3.2588.2.31
--- xc/programs/Xserver/hw/xfree86/CHANGELOG 27 Feb 2003 04:56:44 -0000 3.2588
-+++ xc/programs/Xserver/hw/xfree86/CHANGELOG 8 Oct 2003 17:56:31 -0000 3.2588.2.29
-@@ -1,3 +1,102 @@
++++ xc/programs/Xserver/hw/xfree86/CHANGELOG 21 Oct 2003 02:22:31 -0000 3.2588.2.31
+@@ -1,3 +1,103 @@
+XFree86 4.3.0.2 (xx September 2003)
-+1008. Fixed definititon of UseInstalledOnCrossCompile so that it never is
++1008. Fix some i830+ VT switch/exit crashes (David Dawes, Egbert Eich).
++1007. Fixed definititon of UseInstalledOnCrossCompile so that it never is
+ undefined (Harlod L. Hunt II).
-+1007. Fixing crash on ia64 because of wrong setjmp buffer alignment (Bugzilla
-+1006. #596, John Dennis).
++1006. Fixing crash on ia64 because of wrong setjmp buffer alignment (Bugzilla
++ #596, John Dennis).
+1005. Close freetype fontfile filehandle in mkfontscale, this prevents problems
+ from limitation of simultaniously open files (Bugzilla #676,
+ Jun-ichiro itojun Hagino).
@@ -2550,12 +2564,12 @@
XFree86 4.3.0 (27 February 2003)
964. Add an imake option to allow the glibc21-style setjmp() behaviour
to be forced when auto-detecting it fails (this is needed for RH 7.0).
-@@ -16536,4 +16635,9 @@
+@@ -16536,4 +16636,9 @@
XFree86 3.0 (26 April 1994)
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588 2003/02/27 04:56:44 dawes Exp $
-+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588.2.29 2003/10/08 17:56:31 eich Exp $
++$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588.2.31 2003/10/21 02:22:31 dawes Exp $
+
+
+
@@ -2725,6 +2739,171 @@
PciBus->subclass = PCI_SUBCLASS_BRIDGE_HOST;
PciBus->brcontrol = PCI_PCI_BRIDGE_VGA_EN;
PciBus->preferred_io =
+Index: xc/programs/Xserver/hw/xfree86/doc/LICENSE
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/LICENSE,v
+retrieving revision 1.17
+retrieving revision 1.17.2.1
+diff -u -r1.17 -r1.17.2.1
+--- xc/programs/Xserver/hw/xfree86/doc/LICENSE 24 Feb 2003 04:03:20 -0000 1.17
++++ xc/programs/Xserver/hw/xfree86/doc/LICENSE 17 Oct 2003 21:39:24 -0000 1.17.2.1
+@@ -161,6 +161,62 @@
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
++2.2.3 Theodore Ts'o.
++
++Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights
++reserved.
++
++Redistribution and use in source and binary forms, with or without modifica-
++tion, are permitted provided that the following conditions are met:
++
++ 1. Redistributions of source code must retain the above copyright notice,
++ and the entire permission notice in its entirety, including the dis-
++ claimer of warranties.
++
++ 2. Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++
++ 3. he name of the author may not be used to endorse or promote products
++ derived from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
++INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
++FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO
++EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
++CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
++OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
++ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT
++ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++2.2.4 Theo de Raadt and Damien Miller
++
++Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c)
++2001-2002 Damien Miller. All rights reserved.
++
++Redistribution and use in source and binary forms, with or without modifica-
++tion, are permitted provided that the following conditions are met:
++
++ 1. Redistributions of source code must retain the above copyright notice,
++ this list of conditions and the following disclaimer.
++
++ 2. Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++
++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
++WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
++CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
++EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
++CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
++OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
++ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
++OF THE POSSIBILITY OF SUCH DAMAGE.
++
+ 2.3 NVIDIA Corp
+
+ Copyright (c) 1996 NVIDIA, Corp. All rights reserved.
+@@ -618,7 +674,7 @@
+
+ info@urwpp.de or design@bigelowandholmes.com
+
+- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.12 2003/02/24 03:41:16 dawes Exp $
++ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.12.2.1 2003/10/17 21:37:44 herrb Exp $
+
+
+-$XFree86: xc/programs/Xserver/hw/xfree86/doc/LICENSE,v 1.17 2003/02/24 04:03:20 dawes Exp $
++$XFree86: xc/programs/Xserver/hw/xfree86/doc/LICENSE,v 1.17.2.1 2003/10/17 21:39:24 herrb Exp $
+Index: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v
+retrieving revision 1.12
+retrieving revision 1.12.2.1
+diff -u -r1.12 -r1.12.2.1
+--- xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml 24 Feb 2003 03:41:16 -0000 1.12
++++ xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml 17 Oct 2003 21:37:44 -0000 1.12.2.1
+@@ -8,7 +8,7 @@
+ <date>February 2003</date>
+
+ <ident>
+-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.12 2003/02/24 03:41:16 dawes Exp $
++$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.12.2.1 2003/10/17 21:37:44 herrb Exp $
+ </ident>
+
+ <sect>XFree86 License
+@@ -176,6 +176,66 @@
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
++
++<sect2>Theodore Ts'o.
++<p>
++Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All
++rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++<enum>
++<item>Redistributions of source code must retain the above copyright
++ notice, and the entire permission notice in its entirety,
++ including the disclaimer of warranties.
++<item>Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++<item>he name of the author may not be used to endorse or promote
++ products derived from this software without specific prior
++ written permission.
++</enum>
++
++THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
++WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
++WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
++LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
++OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
++USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
++DAMAGE.
++
++<sect2>Theo de Raadt and Damien Miller
++<p>
++Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
++Copyright (c) 2001-2002 Damien Miller. All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++<enum>
++<item> Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++<item> Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++</enum>
++
++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ <sect1>NVIDIA Corp
+ <p>
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v
@@ -2937,6 +3116,180 @@
InstallDriverSDKObjectModule(i740,$(DRIVERSDKMODULEDIR),drivers)
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/common.h
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v
+retrieving revision 1.6
+retrieving revision 1.6.2.1
+diff -u -r1.6 -r1.6.2.1
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/common.h 6 Feb 2003 04:18:04 -0000 1.6
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/common.h 21 Oct 2003 02:22:37 -0000 1.6.2.1
+@@ -27,12 +27,12 @@
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ **************************************************************************/
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v 1.6 2003/02/06 04:18:04 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v 1.6.2.1 2003/10/21 02:22:37 dawes Exp $ */
+
+ /*
+ * Authors:
+ * Keith Whitwell <keith@tungstengraphics.com>
+- * David Dawes <dawes@tungstengraphics.com>
++ * David Dawes <dawes@xfree86.org>
+ *
+ */
+
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v
+retrieving revision 1.38
+retrieving revision 1.38.2.1
+diff -u -r1.38 -r1.38.2.1
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h 26 Feb 2003 04:19:36 -0000 1.38
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h 21 Oct 2003 02:22:37 -0000 1.38.2.1
+@@ -27,12 +27,12 @@
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ **************************************************************************/
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v 1.38 2003/02/26 04:19:36 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v 1.38.2.1 2003/10/21 02:22:37 dawes Exp $ */
+
+ /*
+ * Authors:
+ * Keith Whitwell <keith@tungstengraphics.com>
+- * David Dawes <dawes@tungstengraphics.com>
++ * David Dawes <dawes@xfree86.org>
+ *
+ */
+
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man,v
+retrieving revision 1.3
+retrieving revision 1.3.2.1
+diff -u -r1.3 -r1.3.2.1
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man 17 Feb 2003 19:19:02 -0000 1.3
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man 21 Oct 2003 02:22:37 -0000 1.3.2.1
+@@ -1,4 +1,4 @@
+-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man,v 1.3 2003/02/17 19:19:02 dawes Exp $
++.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man,v 1.3.2.1 2003/10/21 02:22:37 dawes Exp $
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH I810 __drivermansuffix__ __vendorversion__
+@@ -16,9 +16,12 @@
+ .B i810
+ is an XFree86 driver for Intel integrated graphics chipsets.
+ The driver supports depths 8, 15, 16 and 24. All visual types are
+-supported in depth 8, other depths only support TrueColor. The driver
+-supports hardware accelerated 3D via the Direct Rendering Infrastructure (DRI),
+-but only in depth 16 for the i810/i815 and depths 16 and 24 for later chipsets.
++supported in depth 8. For the i810/i815 other depths support the
++TrueColor and DirectColor visuals. For the 830M and later, only the
++TrueColor visual is supported for depths greater than 8. The driver
++supports hardware accelerated 3D via the Direct Rendering Infrastructure
++(DRI), but only in depth 16 for the i810/i815 and depths 16 and 24 for
++the 830M and later.
+ .SH SUPPORTED HARDWARE
+ .B i810
+ supports the i810, i810-DC100, i810e, i815, 830M, 845G, 852GM, 855GM,
+@@ -30,7 +33,16 @@
+ driver.
+ .PP
+ The Intel 8xx family of integrated graphics chipsets has a unified memory
+-architecture and uses system memory for video ram. By default 8 Megabytes
++architecture and uses system memory for video ram. For the i810 and
++i815 familiy of chipset, operating system support for allocating system
++memory for video use is required in order to use this driver. For the
++830M and later, this is required in order for the driver to use more
++video ram than has been pre-allocated at boot time by the BIOS. This
++is usually achieved with an "agpgart" or "agp" kernel driver. Linux,
++and recent versions of FreeBSD, OpenBSD and NetBSD have such kernel
++drivers available.
++.PP
++By default 8 Megabytes
+ of system memory are used for graphics. For the 830M and later, the
+ default is 8 Megabytes when DRI is not enabled and 32 Megabytes with
+ DRI is enabled. This amount may be changed with the
+@@ -38,8 +50,18 @@
+ entry in the config file
+ .B "Device"
+ section. It may be set to any reasonable value up to 64MB for older
+-chipsets or 128MB for newer chipets. Note that increasing this value
+-will reduce the amount of system memory available for other applications.
++chipsets or 128MB for newer chipets. It is advisable to check the XFree86
++log file to check if any features have been disabled because of insufficient
++video memory. In particular, DRI support or tiling mode may be disabled
++with insufficient video memory. Either of these being disabled will
++reduce performance for 3D applications. Note however, that increasing
++this value too much will reduce the amount of system memory available
++for other applications.
++.PP
++The driver makes use of the video BIOS to program video modes for the 830M
++and later. This limits the video modes that can be used to those provided
++by the video BIOS, and to those that will fit into the amount of video memory
++that the video BIOS is aware of.
+ .PP
+ The following driver
+ .B Options
+@@ -50,7 +72,8 @@
+ .TP
+ .BI "Option \*qSWCursor\*q \*q" boolean \*q
+ Disable or enable software cursor. Default: software cursor is disable
+-and a hardware cursor is used.
++and a hardware cursor is used for configurations where the hardware cursor
++is available.
+ .TP
+ .BI "Option \*qColorKey\*q \*q" integer \*q
+ This sets the default pixel value for the YUV video overlay key.
+@@ -61,8 +84,47 @@
+ 2D acceleration and video. Decreasing this amount leaves more for 3D
+ textures. Increasing it can improve 2D performance at the expense of
+ 3D performance.
+-Default: 256 to 768 depending on the resolution and depth.
++Default: depends on the resolution, depth, and available video memory. The
++driver attempts to allocate at least enough to hold two DVD-sized YUV buffers
++by default. The default used for a specific configuration can be found
++by examining the XFree86 log file.
++.TP
++.BI "Option \*qDRI\*q \*q" boolean \*q
++Disable or enable DRI support.
++Default: DRI is enabled for configurations where it is supported.
+
++.PP
++The following driver
++.B Options
++are supported for the i810 and i815 chipsets:
++.TP
++.BI "Option \*qDDC\*q \*q" boolean \*q
++Disable or enable DDC support.
++Default: enabled.
++.TP
++.BI "Option \*qDac6Bit\*q \*q" boolean \*q
++Enable or disable 6-bits per RGB for 8-bit modes.
++Default: 8-bits per RGB for 8-bit modes.
++.TP
++.BI "Option \*qXvMCSurfaces\*q \*q" integer \*q
++This option enables XvMC. The integer parameter specifies the number of
++surfaces to use. Valid values are 6 and 7.
++Default: XvMC is disabled.
++
++.PP
++The following driver
++.B Options
++are supported for the 830M and later chipsets:
++.TP
++.BI "Option \*qVideoKey\*q \*q" integer \*q
++This is the same as the
++.B \*qColorKey\*q
++option described above. It is provided for compatibility with most
++other drivers.
++.TP
++.BI "Option \*qXVideo\*q \*q" boolean \*q
++Disable or enable XVideo support.
++Default: XVideo is enabled for configurations where it is supported.
+
+
+ .SH "SEE ALSO"
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v
@@ -2964,6 +3317,367 @@
back_size = ((back_size + 4096 - 1) / 4096) * 4096;
}
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v
+retrieving revision 1.7
+retrieving revision 1.7.2.1
+diff -u -r1.7 -r1.7.2.1
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h 28 Jan 2003 22:47:09 -0000 1.7
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h 21 Oct 2003 02:22:38 -0000 1.7.2.1
+@@ -27,12 +27,12 @@
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ **************************************************************************/
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.7 2003/01/28 22:47:09 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.7.2.1 2003/10/21 02:22:38 dawes Exp $ */
+
+ /*
+ * Authors:
+ * Keith Whitwell <keith@tungstengraphics.com>
+- * David Dawes <dawes@tungstengraphics.com>
++ * David Dawes <dawes@xfree86.org>
+ *
+ */
+
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c,v
+retrieving revision 1.6
+retrieving revision 1.6.2.1
+diff -u -r1.6 -r1.6.2.1
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c 18 Dec 2002 15:49:01 -0000 1.6
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c 21 Oct 2003 02:22:38 -0000 1.6.2.1
+@@ -26,7 +26,7 @@
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ **************************************************************************/
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c,v 1.6 2002/12/18 15:49:01 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c,v 1.6.2.1 2003/10/21 02:22:38 dawes Exp $ */
+
+ /*
+ * Reformatted with GNU indent (2.2.8), using the following options:
+@@ -44,7 +44,7 @@
+ /*
+ * Authors:
+ * Keith Whitwell <keith@tungstengraphics.com>
+- * David Dawes <dawes@tungstengraphics.com>
++ * David Dawes <dawes@xfree86.org>
+ *
+ */
+
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v
+retrieving revision 1.12
+retrieving revision 1.12.2.1
+diff -u -r1.12 -r1.12.2.1
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c 8 Feb 2003 21:26:57 -0000 1.12
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c 21 Oct 2003 02:22:38 -0000 1.12.2.1
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v 1.12 2003/02/08 21:26:57 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v 1.12.2.1 2003/10/21 02:22:38 dawes Exp $ */
+ /**************************************************************************
+
+ Copyright 2001 VA Linux Systems Inc., Fremont, California.
+@@ -42,7 +42,7 @@
+
+ /*
+ * Authors: Jeff Hartmann <jhartmann@valinux.com>
+- * David Dawes <dawes@tungstengraphics.com>
++ * David Dawes <dawes@xfree86.org>
+ * Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+@@ -822,6 +822,9 @@
+ {
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ I830Ptr pI830 = I830PTR(pScrn);
++
++ if (!pScrn->vtSema)
++ return;
+
+ if (syncType == DRI_3D_SYNC &&
+ oldContextType == DRI_2D_CONTEXT && newContextType == DRI_2D_CONTEXT) {
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h,v
+retrieving revision 1.5
+retrieving revision 1.5.2.1
+diff -u -r1.5 -r1.5.2.1
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h 10 Dec 2002 01:27:05 -0000 1.5
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h 21 Oct 2003 02:22:38 -0000 1.5.2.1
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h,v 1.5 2002/12/10 01:27:05 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h,v 1.5.2.1 2003/10/21 02:22:38 dawes Exp $ */
+
+ #ifndef _I830_DRI_H
+ #define _I830_DRI_H
+@@ -131,7 +131,7 @@
+ unsigned int TexState3[I830_TEX_SETUP_SIZE];
+ unsigned int TexBlendState3[I830_TEXBLEND_SIZE];
+ unsigned int TexBlendStateWordsUsed3;
+-
++
+ unsigned int StippleState[I830_STP_SETUP_SIZE];
+ } I830SAREARec, *I830SAREAPtr;
+
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v
+retrieving revision 1.27
+retrieving revision 1.27.2.2
+diff -u -r1.27 -r1.27.2.2
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 14 Feb 2003 17:12:42 -0000 1.27
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 21 Oct 2003 02:22:38 -0000 1.27.2.2
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.27 2003/02/14 17:12:42 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.27.2.2 2003/10/21 02:22:38 dawes Exp $ */
+ /**************************************************************************
+
+ Copyright 2001 VA Linux Systems Inc., Fremont, California.
+@@ -43,7 +43,7 @@
+ /*
+ * Authors: Jeff Hartmann <jhartmann@valinux.com>
+ * Abraham van der Merwe <abraham@2d3d.co.za>
+- * David Dawes <dawes@tungstengraphics.com>
++ * David Dawes <dawes@xfree86.org>
+ */
+
+ /*
+@@ -1562,7 +1562,7 @@
+ "VideoRam reduced to %d kByte (limited to aperture size)\n",
+ pScrn->videoRam);
+ }
+-
++
+ if (mem > 0) {
+ /*
+ * If the reserved (BIOS accessible) memory is less than the desired
+@@ -1589,13 +1589,11 @@
+ else
+ pI830->newBIOSMemSize =
+ KB(ROUND_DOWN_TO(pScrn->videoRam - reserve, 64));
+-
+ if (pI830->vbeInfo->TotalMemory * 64 < pI830->newBIOSMemSize / 1024) {
+
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Will attempt to tell the BIOS that there is "
+ "%d kB VideoRAM\n", pI830->newBIOSMemSize / 1024);
+-
+ if (SaveBIOSMemSize(pScrn)) {
+ pI830->overrideBIOSMemSize = TRUE;
+ SetBIOSMemSize(pScrn, pI830->newBIOSMemSize);
+@@ -1677,8 +1675,8 @@
+ else
+ pI830->CursorNeedsPhysical = FALSE;
+
+- /* Force ring buffer to be in low memory for the 845G. */
+- if (IS_845G(pI830))
++ /* Force ring buffer to be in low memory for the 845G and later. */
++ if (IS_845G(pI830) || IS_I85X(pI830) || IS_I865G(pI830))
+ pI830->NeedRingBufferLow = TRUE;
+
+ /*
+@@ -2238,16 +2236,17 @@
+ #endif
+
+ pVesa = pI830->vesa;
+- /* This save/restore method doesn't work for 845G BIOS */
+ /*
+- * XXX If it's fixed in production versions, this could be removed.
+- *
++ * This save/restore method doesn't work for 845G BIOS, or for some
++ * other platforms. Enable it in all cases.
++ */
++ /*
+ * KW: This may have been because of the behaviour I've found on my
+ * board: The 'save' command actually modifies the interrupt
+ * registers, turning off the irq & breaking the kernel module
+ * behaviour.
+ */
+- if (!I845G_VBE_WORKAROUND || !IS_845G(pI830)) {
++ if (!I845G_VBE_WORKAROUND) {
+ CARD16 imr = INREG16(IMR);
+ CARD16 ier = INREG16(IER);
+ CARD16 hwstam = INREG16(HWSTAM);
+@@ -3257,6 +3256,8 @@
+ RestoreHWState(pScrn);
+ RestoreBIOSMemSize(pScrn);
+ I830UnbindGARTMemory(pScrn);
++ if (pI830->AccelInfoRec)
++ pI830->AccelInfoRec->NeedToSync = FALSE;
+ }
+
+ /*
+@@ -3386,35 +3387,36 @@
+
+ DPRINTF(PFX, "I830BIOSSaveScreen: %d, on is %s\n", mode, BOOLTOSTRING(on));
+
+- for (i = 0; i < MAX_DISPLAY_PIPES; i++) {
+- if (i == 0) {
+- ctrl = DSPACNTR;
+- base = DSPABASE;
+- } else {
+- ctrl = DSPBCNTR;
+- base = DSPBADDR;
++ if (pScrn->vtSema) {
++ for (i = 0; i < MAX_DISPLAY_PIPES; i++) {
++ if (i == 0) {
++ ctrl = DSPACNTR;
++ base = DSPABASE;
++ } else {
++ ctrl = DSPBCNTR;
++ base = DSPBADDR;
++ }
++ if (pI830->planeEnabled[i]) {
++ temp = INREG(ctrl);
++ if (on)
++ temp |= DISPLAY_PLANE_ENABLE;
++ else
++ temp &= ~DISPLAY_PLANE_ENABLE;
++ OUTREG(ctrl, temp);
++ /* Flush changes */
++ temp = INREG(base);
++ OUTREG(base, temp);
++ }
+ }
+- if (pI830->planeEnabled[i]) {
+- temp = INREG(ctrl);
++
++ if (pI830->CursorInfoRec && !pI830->SWCursor && pI830->cursorOn) {
+ if (on)
+- temp |= DISPLAY_PLANE_ENABLE;
++ pI830->CursorInfoRec->ShowCursor(pScrn);
+ else
+- temp &= ~DISPLAY_PLANE_ENABLE;
+- OUTREG(ctrl, temp);
+- /* Flush changes */
+- temp = INREG(base);
+- OUTREG(base, temp);
++ pI830->CursorInfoRec->HideCursor(pScrn);
++ pI830->cursorOn = TRUE;
+ }
+ }
+-
+- if (pI830->CursorInfoRec && !pI830->SWCursor && pI830->cursorOn) {
+- if (on)
+- pI830->CursorInfoRec->ShowCursor(pScrn);
+- else
+- pI830->CursorInfoRec->HideCursor(pScrn);
+- pI830->cursorOn = TRUE;
+- }
+-
+ return TRUE;
+ }
+
+@@ -3584,3 +3586,5 @@
+ pScrn->ValidMode = I830ValidMode;
+ pScrn->PMEvent = I830PMEvent;
+ }
++
++
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v
+retrieving revision 1.6
+retrieving revision 1.6.2.1
+diff -u -r1.6 -r1.6.2.1
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 8 Feb 2003 02:26:56 -0000 1.6
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 21 Oct 2003 02:22:39 -0000 1.6.2.1
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v 1.6 2003/02/08 02:26:56 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v 1.6.2.1 2003/10/21 02:22:39 dawes Exp $ */
+ /**************************************************************************
+
+ Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+@@ -44,7 +44,7 @@
+ /*
+ * Authors:
+ * Keith Whitwell <keith@tungstengraphics.com>
+- * David Dawes <dawes@tungstengraphics.com>
++ * David Dawes <dawes@xfree86.org>
+ *
+ */
+
+@@ -1298,7 +1298,7 @@
+ "MakeTiles failed for the back buffer.\n");
+ }
+ }
+-
++
+ }
+ #endif /* XF86DRI */
+
+Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c,v
+retrieving revision 1.6
+retrieving revision 1.6.2.1
+diff -u -r1.6 -r1.6.2.1
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c 6 Feb 2003 04:18:05 -0000 1.6
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c 21 Oct 2003 02:22:39 -0000 1.6.2.1
+@@ -1,6 +1,6 @@
+ #define VIDEO_DEBUG 0
+ /***************************************************************************
+-
++
+ Copyright 2000 Intel Corporation. All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+@@ -24,7 +24,7 @@
+ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ **************************************************************************/
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c,v 1.6 2003/02/06 04:18:05 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c,v 1.6.2.1 2003/10/21 02:22:39 dawes Exp $ */
+
+ /*
+ * Reformatted with GNU indent (2.2.8), using the following options:
+@@ -46,7 +46,7 @@
+ *
+ * Authors:
+ * Alan Hourihane <alanh@tungstengraphics.com>
+- * David Dawes <dawes@tungstengraphics.com>
++ * David Dawes <dawes@xfree86.org>
+ *
+ * Derived from i810 Xv driver:
+ *
+@@ -1013,7 +1013,7 @@
+ SetCoeffRegs(&coeffs[i][tap2Fix], mantSize + 2, pCoeff, pos);
+ else
+ SetCoeffRegs(&coeffs[i][tap2Fix], mantSize, pCoeff, pos);
+-
++
+ sum = 0.0;
+ for (j = 0; j < taps; j++)
+ sum += coeffs[i][j];
+@@ -1175,7 +1175,7 @@
+ scaleChanged = TRUE;
+ overlay->YRGBSCALE = newval;
+ }
+-
++
+ newval = (xscaleIntUV << 16) | ((xscaleFractUV & 0xFFF) << 3) |
+ ((yscaleFractUV & 0xFFF) << 20);
+ if (newval != overlay->UVSCALE) {
+@@ -1190,14 +1190,14 @@
+ }
+
+ /* Recalculate coefficients if the scaling changed. */
+-
++
+ /*
+ * Only Horizontal coefficients so far.
+ */
+ if (scaleChanged) {
+ double fCutoffY;
+ double fCutoffUV;
+-
++
+ fCutoffY = xscaleFract / 4096.0;
+ fCutoffUV = xscaleFractUV / 4096.0;
+
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile,v
@@ -5956,16 +6670,16 @@
===================================================================
RCS file: /cvs/xc/programs/xdm/genauth.c,v
retrieving revision 3.15
-retrieving revision 3.15.2.2
-diff -u -r3.15 -r3.15.2.2
+retrieving revision 3.15.2.3
+diff -u -r3.15 -r3.15.2.3
--- xc/programs/xdm/genauth.c 6 Oct 2002 18:12:29 -0000 3.15
-+++ xc/programs/xdm/genauth.c 29 Sep 2003 20:27:30 -0000 3.15.2.2
++++ xc/programs/xdm/genauth.c 17 Oct 2003 21:37:45 -0000 3.15.2.3
@@ -26,7 +26,7 @@
from The Open Group.
*/
-/* $XFree86: xc/programs/xdm/genauth.c,v 3.15 2002/10/06 18:12:29 herrb Exp $ */
-+/* $XFree86: xc/programs/xdm/genauth.c,v 3.15.2.2 2003/09/29 20:27:30 herrb Exp $ */
++/* $XFree86: xc/programs/xdm/genauth.c,v 3.15.2.3 2003/10/17 21:37:45 herrb Exp $ */
/*
* xdm - display manager daemon
@@ -5995,7 +6709,7 @@
static void
longtochars (long l, unsigned char *c)
-@@ -66,66 +75,295 @@
+@@ -66,66 +75,293 @@
#endif
@@ -6021,8 +6735,6 @@
+/* ####################################################################### */
+
+/*
-+ * Stolen from the Linux kernel.
-+ *
+ * Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All
+ * rights reserved.
+ *
@@ -6328,7 +7040,7 @@
tmpkey[0] = 0;
_XdmcpWrapperToOddParity(tmpkey, key);
close(fd);
-@@ -133,15 +371,27 @@
+@@ -133,15 +369,27 @@
} else {
close(fd);
}
@@ -6363,7 +7075,7 @@
longtochars (sum[0], tmpkey+0);
longtochars (sum[1], tmpkey+4);
tmpkey[0] = 0;
-@@ -151,115 +401,84 @@
+@@ -151,115 +399,84 @@
#endif
@@ -6649,10 +7361,9 @@
RCS file: xc/programs/xdm/prngc.c
diff -N xc/programs/xdm/prngc.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ xc/programs/xdm/prngc.c 29 Sep 2003 21:16:15 -0000 1.1.2.2
-@@ -0,0 +1,193 @@
-+/* $XFree86: xc/programs/xdm/prngc.c,v 1.1.2.2 2003/09/29 21:16:15 herrb Exp $ */
-+/* Code grabbed from OpenSSH - portable version */
++++ xc/programs/xdm/prngc.c 17 Oct 2003 21:37:45 -0000 1.1.2.3
+@@ -0,0 +1,192 @@
++/* $XFree86: xc/programs/xdm/prngc.c,v 1.1.2.3 2003/10/17 21:37:45 herrb Exp $ */
+/*
+ * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
+ * Copyright (c) 2001-2002 Damien Miller. All rights reserved.
Modified: branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff 2003-10-24 20:47:33 UTC (rev 712)
+++ branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff 2003-10-24 22:36:18 UTC (rev 713)
@@ -1825,9 +1825,8 @@
d->name, d->class ? d->class : "", type);
}
d->displayType = displayType;
-diff -urN xc/programs/xdm~/genauth.c xc/programs/xdm/genauth.c
---- xc/programs/xdm~/genauth.c 2003-10-08 21:42:04.000000000 -0500
-+++ xc/programs/xdm/genauth.c 2003-10-08 21:43:33.000000000 -0500
+--- xc/programs/xdm/genauth.c~ 2003-10-24 17:18:33.000000000 -0500
++++ xc/programs/xdm/genauth.c 2003-10-24 17:18:37.000000000 -0500
@@ -33,14 +33,16 @@
* Author: Keith Packard, MIT X Consortium
*/
@@ -1875,7 +1874,7 @@
#endif
#ifdef POLL_DEV_RANDOM
-@@ -339,7 +330,7 @@
+@@ -337,7 +328,7 @@
if ((offset = sumFile (randomFile, BSIZ, SEEK_SET, 0)) == BSIZ)
return;
}
@@ -1884,7 +1883,7 @@
}
#endif /* !ARC4_RANDOM && !DEV_RANDOM */
-@@ -372,7 +363,7 @@
+@@ -370,7 +361,7 @@
close(fd);
}
} else {
@@ -1893,7 +1892,7 @@
randomDevice, errno);
}
#endif
-@@ -459,10 +450,10 @@
+@@ -457,10 +448,10 @@
return 1;
}
close(fd);
Modified: branches/4.3.0/sid/debian/patches/056_i810_make_i830_usable.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/056_i810_make_i830_usable.diff 2003-10-24 20:47:33 UTC (rev 712)
+++ branches/4.3.0/sid/debian/patches/056_i810_make_i830_usable.diff 2003-10-24 22:36:18 UTC (rev 713)
@@ -14,9 +14,9 @@
see bugs.xfree86.org #103
---- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c.orig 2003-10-17 15:17:50.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 2003-10-17 15:20:27.000000000 +0200
-@@ -3254,6 +3254,10 @@
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c~ 2003-10-24 17:19:18.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 2003-10-24 17:19:24.000000000 -0500
+@@ -3253,6 +3253,10 @@
#endif
ResetState(pScrn, TRUE);
Reply to: