Author: dnusinow
Date: 2006-02-26 17:26:42 -0500 (Sun, 26 Feb 2006)
New Revision: 1313
Added:
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/01_fix_matrox_display.diff
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/series
Modified:
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/changelog
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/rules
Log:
* Port patches from trunk:
+ general/032_fix_matrox_display.diff
Modified:
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/changelog
===================================================================
--- branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/changelog
2006-02-26 21:55:58 UTC (rev 1312)
+++ branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/changelog
2006-02-26 22:26:42 UTC (rev 1313)
@@ -1,3 +1,10 @@
+xserver-xorg-video-mga (1:1.2.1.3-2) experimental; urgency=low
+
+ * Port patches from trunk:
+ + general/032_fix_matrox_display.diff
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 17:26:00 -0500
+
xserver-xorg-video-mga (1:1.2.1.3-1) experimental; urgency=low
* First upload to Debian
Added:
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/01_fix_matrox_display.diff
===================================================================
---
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/01_fix_matrox_display.diff
2006-02-26 21:55:58 UTC (rev 1312)
+++
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/01_fix_matrox_display.diff
2006-02-26 22:26:42 UTC (rev 1313)
@@ -0,0 +1,13 @@
+Index: xf86-video-mga-X11R7.0-1.2.1.3/src/mga_storm.c
+===================================================================
+--- xf86-video-mga-X11R7.0-1.2.1.3.orig/src/mga_storm.c 2006-01-12
22:54:45.000000000 -0500
++++ xf86-video-mga-X11R7.0-1.2.1.3/src/mga_storm.c 2006-02-26
17:25:37.000000000 -0500
+@@ -1079,7 +1079,7 @@
+ CHECK_DMA_QUIESCENT(pMga, pScrn);
+
+ /* MGAISBUSY() reportedly causes a freeze for Mystique revision 2 and
older */
+- if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 &&
pMga->ChipRev <= 2)))
++ if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 &&
pMga->ChipRev < 2)))
+ while(MGAISBUSY());
+ /* flush cache before a read (mga-1064g 5.1.6) */
+ OUTREG8(MGAREG_CRTC_INDEX, 0);
Added:
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/series
===================================================================
---
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/series
2006-02-26 21:55:58 UTC (rev 1312)
+++
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/series
2006-02-26 22:26:42 UTC (rev 1313)
@@ -0,0 +1 @@
+01_fix_matrox_display.diff
Modified: branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/rules
===================================================================
--- branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/rules
2006-02-26 21:55:58 UTC (rev 1312)
+++ branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/rules
2006-02-26 22:26:42 UTC (rev 1313)
@@ -31,7 +31,7 @@
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -44,7 +44,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
