X Strike Force XFree86 SVN commit: rev 684 - in branches/4.3.0/sid/debian: . patches
Author: rmh
Date: 2003-10-21 17:54:56 -0500 (Tue, 21 Oct 2003)
New Revision: 684
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/056_i810_make_i830_usable.diff
Log:
* Fix build error when NOT_BUILDING_X_SERVER=yes. The "pI830" variable
introduced in patch 056 is used unconditionaly, but only declared when
XF86DRI macro is defined. [Robert Millan]
- debian/patches/056_i810_make_i830_usable.diff: only access pI830 when
XF86DRI is defined.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-10-21 21:57:43 UTC (rev 683)
+++ branches/4.3.0/sid/debian/changelog 2003-10-21 22:54:56 UTC (rev 684)
@@ -131,6 +131,13 @@
(Closes: #216896)
- debian/patches/099_ati_recognize_radeon_9200_se.diff: new
+ * Fix build error when NOT_BUILDING_X_SERVER=yes. The "pI830" variable
+ introduced in patch 056 is used unconditionaly, but only declared when
+ XF86DRI macro is defined. [Robert Millan]
+ - debian/patches/056_i810_make_i830_usable.diff: only access pI830 when
+ XF86DRI is defined.
+
+
-- Branden Robinson <branden@debian.org> Tue, 21 Oct 2003 16:57:12 -0500
xfree86 (4.3.0-0pre1v3) experimental; urgency=high
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-21 21:57:43 UTC (rev 683)
+++ branches/4.3.0/sid/debian/patches/056_i810_make_i830_usable.diff 2003-10-21 22:54:56 UTC (rev 684)
@@ -14,15 +14,16 @@
see bugs.xfree86.org #103
---- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
-@@ -3254,6 +3255,8 @@
+--- 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 @@
#endif
-
+
ResetState(pScrn, TRUE);
++#ifdef XF86DRI
+ /* NeedToSync is set TRUE in RefreshRing called from ResetState() */
+ pI830->AccelInfoRec->NeedToSync = FALSE;
++#endif
RestoreHWState(pScrn);
RestoreBIOSMemSize(pScrn);
I830UnbindGARTMemory(pScrn);
-
Reply to: