debian/changelog | 7 +++++++
debian/patches/100_bgnoneroot.patch | 18 +++++++++---------
2 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 64b3d4c93dc03ab1b492fe773f390fcef43c650c
Author: Steve Langasek <steve.langa...@canonical.com>
Date: Tue Feb 1 19:25:06 2011 -0800
releasing version 1:0.4.2-3ubuntu4
diff --git a/debian/changelog b/debian/changelog
index 2272cd7..b8eeece 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-fbdev (1:0.4.2-3ubuntu4) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.2-3ubuntu4) natty; urgency=low
* debian/patches/100_bgnoneroot.patch: defer this initialization until we
have a valid Screen to attach to. LP: #711614.
- -- Steve Langasek <steve.langa...@ubuntu.com> Wed, 02 Feb 2011 03:23:28 +0000
+ -- Steve Langasek <steve.langa...@ubuntu.com> Wed, 02 Feb 2011 03:25:02 +0000
xserver-xorg-video-fbdev (1:0.4.2-3ubuntu3) natty; urgency=low
commit 0a67fa85b7886c29b82f9d18fc9a4f0a84664187
Author: Steve Langasek <steve.langa...@canonical.com>
Date: Tue Feb 1 19:24:53 2011 -0800
debian/patches/100_bgnoneroot.patch: defer this initialization until we
have a valid Screen to attach to. LP: #711614.
diff --git a/debian/changelog b/debian/changelog
index 19deabe..2272cd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-fbdev (1:0.4.2-3ubuntu4) UNRELEASED; urgency=low
+
+ * debian/patches/100_bgnoneroot.patch: defer this initialization until we
+ have a valid Screen to attach to. LP: #711614.
+
+ -- Steve Langasek <steve.langa...@ubuntu.com> Wed, 02 Feb 2011 03:23:28 +0000
+
xserver-xorg-video-fbdev (1:0.4.2-3ubuntu3) natty; urgency=low
* debian/control: Bump build-depends on xserver-xorg-dev to really,
diff --git a/debian/patches/100_bgnoneroot.patch
b/debian/patches/100_bgnoneroot.patch
index 1c7433e..1c921c8 100644
--- a/debian/patches/100_bgnoneroot.patch
+++ b/debian/patches/100_bgnoneroot.patch
@@ -1,17 +1,17 @@
Index: xserver-xorg-video-fbdev/src/fbdev.c
===================================================================
---- xserver-xorg-video-fbdev.orig/src/fbdev.c 2011-01-28 17:52:29.510667250
+1100
-+++ xserver-xorg-video-fbdev/src/fbdev.c 2011-01-28 17:53:59.150667250
+1100
-@@ -404,6 +404,12 @@
-
- pScrn->monitor = pScrn->confScreen->monitor;
+--- xserver-xorg-video-fbdev.orig/src/fbdev.c
++++ xserver-xorg-video-fbdev/src/fbdev.c
+@@ -670,6 +670,12 @@
+ pScrn->offset.red,pScrn->offset.green,pScrn->offset.blue);
+ #endif
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
-+ pScrn->pScreen->canDoBGNoneRoot = TRUE;
++ pScreen->canDoBGNoneRoot = TRUE;
+#else
+ pScrn->canDoBGNoneRoot = TRUE;
+#endif
+
- FBDevGetRec(pScrn);
- fPtr = FBDEVPTR(pScrn);
-
+ if (NULL == (fPtr->fbmem = fbdevHWMapVidmem(pScrn))) {
+ xf86DrvMsg(scrnIndex,X_ERROR,"mapping of video memory"
+ " failed\n");
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pktlj-0003w6...@alioth.debian.org
