summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-04-10 19:10:54 +0000
committerjoerg <joerg@pkgsrc.org>2007-04-10 19:10:54 +0000
commit86b75a0e5313b9dcce83486a647674b9109d78f0 (patch)
tree3faafc90b99990e04a27520e20fbf393f7535521
parentf34e1590f2d95015849c314984444aa4fede7c73 (diff)
downloadpkgsrc-86b75a0e5313b9dcce83486a647674b9109d78f0.tar.gz
Include the mode restore bugfix from monolithic Xorg, that is derived
from the version in xsrc which in turn was provided by Matthieu Herb over 3 years ago on the XFree86 lists. Suggested by various developers, hold-back due to the working state in xorg-server 1.1.1. Tracing down the exact change showed that the changed default color depth made this issue a lot more prominent again. Discussed with Eric Anholt. Bump revision.
-rw-r--r--x11/xf86-video-ati/Makefile3
-rw-r--r--x11/xf86-video-ati/distinfo3
-rw-r--r--x11/xf86-video-ati/patches/patch-aa31
3 files changed, 35 insertions, 2 deletions
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index 15259295d1d..8a2f2cdebfa 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/11/14 17:24:33 reed Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/10 19:10:54 joerg Exp $
DISTNAME= xf86-video-ati-6.6.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo
index e0a161ca858..e20f6ff3c9c 100644
--- a/x11/xf86-video-ati/distinfo
+++ b/x11/xf86-video-ati/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/14 17:16:27 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/04/10 19:10:54 joerg Exp $
SHA1 (xf86-video-ati-6.6.3.tar.bz2) = b911df1f4b41ad37028c708e2c95e5a729a32ede
RMD160 (xf86-video-ati-6.6.3.tar.bz2) = a1c24c13ea88fa38f34e3f0540b53082ab2ae129
Size (xf86-video-ati-6.6.3.tar.bz2) = 723083 bytes
+SHA1 (patch-aa) = 0f8a8514f58c0b535e8d7048025ebfaf097f53a0
diff --git a/x11/xf86-video-ati/patches/patch-aa b/x11/xf86-video-ati/patches/patch-aa
new file mode 100644
index 00000000000..df2fbb6f959
--- /dev/null
+++ b/x11/xf86-video-ati/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2007/04/10 19:10:55 joerg Exp $
+
+--- src/radeon_driver.c.orig 2007-04-10 20:15:31.000000000 +0200
++++ src/radeon_driver.c
+@@ -7374,7 +7374,7 @@ static void RADEONSave(ScrnInfoPtr pScrn
+ vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
+ # else
+ /* Save mode * & fonts & cmap */
+- vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS);
++ vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL);
+ # endif
+ vgaHWLock(hwp);
+ }
+@@ -7450,7 +7450,7 @@ static void RADEONRestore(ScrnInfoPtr pS
+ */
+ vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
+ # else
+- vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
++ vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL );
+ # endif
+ vgaHWLock(hwp);
+ } else {
+@@ -7465,7 +7465,7 @@ static void RADEONRestore(ScrnInfoPtr pS
+ #if defined(__powerpc__)
+ vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE);
+ #else
+- vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
++ vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_ALL);
+ #endif
+ vgaHWLock(hwp0);
+ }