X Strike Force XFree86 SVN commit: r2162 - in trunk/debian: . patches
Author: branden
Date: 2005-01-25 18:17:30 -0500 (Tue, 25 Jan 2005)
New Revision: 2162
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_xorg.diff
Log:
Grab patch from X.Org CVS (via Jan Kreuzer) to increase DDC retry delay a
little bit, which permits DDC probing to succeed on some hardware
configurations where it would otherwise fail. Thanks, Jan!
(Closes: #291243)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-25 22:40:01 UTC (rev 2161)
+++ trunk/debian/CHANGESETS 2005-01-25 23:17:30 UTC (rev 2162)
@@ -224,4 +224,10 @@
(Closes: #232357)
2161
+Grab patch from X.Org CVS (via Jan Kreuzer) to increase DDC retry delay a
+little bit, which permits DDC probing to succeed on some hardware
+configurations where it would otherwise fail. Thanks, Jan!
+(Closes: #291243)
+ 2162
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-25 22:40:01 UTC (rev 2161)
+++ trunk/debian/changelog 2005-01-25 23:17:30 UTC (rev 2162)
@@ -169,8 +169,13 @@
+ No longer creates spurious levels of directory hierarchy.
(Closes: #232357)
- -- Branden Robinson <branden@debian.org> Tue, 25 Jan 2005 17:24:51 -0500
+ * Grab patch from X.Org CVS (via Jan Kreuzer) to increase DDC retry delay a
+ little bit, which permits DDC probing to succeed on some hardware
+ configurations where it would otherwise fail. Thanks, Jan!
+ (Closes: #291243)
+ -- Branden Robinson <branden@debian.org> Tue, 25 Jan 2005 18:15:24 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Modified: trunk/debian/patches/000_stolen_from_xorg.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_xorg.diff 2005-01-25 22:40:01 UTC (rev 2161)
+++ trunk/debian/patches/000_stolen_from_xorg.diff 2005-01-25 23:17:30 UTC (rev 2162)
@@ -18,6 +18,9 @@
xc/programs/Xserver/hw/xfree86/common/xf86str.h
* Import minimum bits required to compile nv driver from X.org
+xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c @ 1.4
+ Bug #2004: Make DDC delay slightly longer. (Thomas J. Moore)
+
diff -Naurd xc.orig/programs/Xserver/hw/xfree86/common/xf86str.h xc/programs/Xserver/hw/xfree86/common/xf86str.h
--- xc.orig/programs/Xserver/hw/xfree86/common/xf86str.h 2004-09-15 10:05:46.000000000 +0000
+++ xc/programs/Xserver/hw/xfree86/common/xf86str.h 2004-09-15 10:14:05.000000000 +0000
@@ -293,3 +296,14 @@
+extern int XAAGetPatternROP_PM(int i);
+
#endif /* _XAAROP_H */
+--- xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c~ 2005-01-25 18:09:00.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c 2005-01-25 18:09:36.000000000 -0500
+@@ -87,7 +87,7 @@
+ d_secs = (a_secs - b_secs);
+ d_usecs = (a_usecs - b_usecs);
+ diff = d_secs*1000000 + d_usecs;
+- } while (diff>0 && diff< (usec + 1));
++ } while (diff>=0 && diff< (usec + 1));
+ }
+ }
+ #endif
Reply to: