xserver-xorg-video-ati: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/patches/100_radeon-6.9.0-bgnr-enable.patch | 11 ++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 1d881e30e3d32096ce67d24501561ae2d83b89e5
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jan 31 19:35:24 2011 +1100
Fix typo in Plymouth integration patch
diff --git a/debian/changelog b/debian/changelog
index 6218a66..c235d9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:6.13.2+git20110124.fadee040-0ubuntu2) natty; urgency=low
+
+ * debian/patches/100_radeon-6.9.0-bgnr-enable.patch: Fix typo in Xserver 1.10
+ ABI codepath.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 31 Jan 2011 19:34:41 +1100
+
xserver-xorg-video-ati (1:6.13.2+git20110124.fadee040-0ubuntu1) natty; urgency=low
* Checkout from git 20110124 (master branch) up to commit
diff --git a/debian/patches/100_radeon-6.9.0-bgnr-enable.patch b/debian/patches/100_radeon-6.9.0-bgnr-enable.patch
index a671a5f..36f8179 100644
--- a/debian/patches/100_radeon-6.9.0-bgnr-enable.patch
+++ b/debian/patches/100_radeon-6.9.0-bgnr-enable.patch
@@ -1,12 +1,13 @@
-diff -Nurp patched//src/radeon_kms.c working//src/radeon_kms.c
---- patched//src/radeon_kms.c 2011-01-27 19:20:35.454881380 -0800
-+++ working//src/radeon_kms.c 2011-01-27 19:54:54.411057080 -0800
-@@ -840,6 +840,11 @@ Bool RADEONScreenInit_KMS(int scrnIndex,
+Index: xserver-xorg-video-ati/src/radeon_kms.c
+===================================================================
+--- xserver-xorg-video-ati.orig/src/radeon_kms.c 2011-01-31 19:05:30.008994413 +1100
++++ xserver-xorg-video-ati/src/radeon_kms.c 2011-01-31 19:18:22.550127483 +1100
+@@ -826,6 +826,11 @@
int ret;
pScrn->fbOffset = 0;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
-+ pScrn->pScreen->canDoBGNoneRoot = TRUE
++ pScreen->canDoBGNoneRoot = TRUE;
+#else
+ pScrn->canDoBGNoneRoot = TRUE;
+#endif
Reply to: