debian/changelog | 6 ++++++
debian/patches/xmir.patch | 17 -----------------
2 files changed, 6 insertions(+), 17 deletions(-)
New commits:
commit 67368975c4395be906c96f8a73fda379072757f2
Author: Maarten Lankhorst <d...@mblankhorst.nl>
Date: Wed Feb 5 14:33:09 2014 +0000
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 5632ec2..64d2318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.99.909-0ubuntu2) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.909-0ubuntu2) trusty; urgency=medium
* Refresh xmir patch.
- -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 05 Feb 2014
14:31:48 +0000
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 05 Feb 2014
14:33:04 +0000
xserver-xorg-video-intel (2:2.99.909-0ubuntu1) trusty; urgency=medium
commit 11cd255f3ca7d87692da39f09c50776e8464678d
Author: Maarten Lankhorst <d...@mblankhorst.nl>
Date: Wed Feb 5 14:32:55 2014 +0000
Refresh xmir patch.
diff --git a/debian/changelog b/debian/changelog
index 1160791..5632ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.909-0ubuntu2) UNRELEASED; urgency=medium
+
+ * Refresh xmir patch.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 05 Feb 2014
14:31:48 +0000
+
xserver-xorg-video-intel (2:2.99.909-0ubuntu1) trusty; urgency=medium
[ Timo Aaltonen ]
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index af283b3..c772429 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -428,23 +428,6 @@ Date: Wed Jul 24 01:44:30 2013 +0100
/* Sanity check */
if (hosted() && (sna->flags & SNA_IS_HOSTED) == 0) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
-@@ -519,9 +522,14 @@ static Bool sna_pre_init(ScrnInfoPtr scr
- goto cleanup;
- }
-
-- preferred_depth = sna->info->gen < 030 ? 15 : 24;
-- if (!fb_supports_depth(fd, preferred_depth))
-+ if (sna->xmir) {
-+ /* XXX query depth from xmir */
- preferred_depth = 24;
-+ } else {
-+ preferred_depth = sna->info->gen < 030 ? 15 : 24;
-+ if (!fb_supports_depth(fd, preferred_depth))
-+ preferred_depth = 24;
-+ }
-
- if (!xf86SetDepthBpp(scrn, preferred_depth, 0, 0,
- Support32bppFb |
@@ -558,9 +566,13 @@ static Bool sna_pre_init(ScrnInfoPtr scr
intel_detect_chipset(scrn, pEnt);
--
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/e1wb5ol-0006v9...@moszumanska.debian.org
