xserver-xorg-video-nouveau: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/patches/02_nouveau_bgnr | 21 +++++++++++++++------
2 files changed, 22 insertions(+), 6 deletions(-)
New commits:
commit ead27d8828f98ed7a4637cff74025b9d4bea2445
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jan 31 18:51:22 2011 +1100
Fix Plymouth integration patch to not SIGSEGV the server.
Again, builds ≠ works. :(
diff --git a/debian/changelog b/debian/changelog
index 3401027..39890a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu2) natty; urgency=low
+
+ * debian/patches/02_nouveau_bgnr: Fix Xserver 1.10 codepath to not crash the
+ server.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 31 Jan 2011 18:48:03 +1100
+
xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu1) natty; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
diff --git a/debian/patches/02_nouveau_bgnr b/debian/patches/02_nouveau_bgnr
index 5951841..25a83eb 100644
--- a/debian/patches/02_nouveau_bgnr
+++ b/debian/patches/02_nouveau_bgnr
@@ -9,17 +9,26 @@ Subject: [PATCH 2/2] set canDoBGNoneRoot
Index: xserver-xorg-video-nouveau/src/nv_driver.c
===================================================================
---- xserver-xorg-video-nouveau.orig/src/nv_driver.c 2011-01-26 13:23:04.621550002 +1100
-+++ xserver-xorg-video-nouveau/src/nv_driver.c 2011-01-26 13:28:28.711550002 +1100
-@@ -690,6 +690,11 @@
+--- xserver-xorg-video-nouveau.orig/src/nv_driver.c 2011-01-31 18:37:19.986515660 +1100
++++ xserver-xorg-video-nouveau/src/nv_driver.c 2011-01-31 18:43:01.277016240 +1100
+@@ -690,6 +690,9 @@
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
-+ pScrn->pScreen->canDoBGNoneRoot = 1;
-+#else
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 9
+ pScrn->canDoBGNoneRoot = 1;
+#endif
/*
* The first thing we should figure out is the depth, bpp, etc.
*/
+@@ -1024,6 +1027,10 @@
+ }
+ }
+
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
++ pScreen->canDoBGNoneRoot = TRUE;
++#endif
++
+ if (!pNv->NoAccel)
+ nouveau_dri2_init(pScreen);
+
Reply to: