xorg-server: Changes to 'ubuntu'
debian/changelog | 6 +++++
debian/patches/fix-int10.patch | 42 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 49 insertions(+)
New commits:
commit 859326d78634517aa03e3a0427f5da2dc9fd3293
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Thu Mar 19 10:14:12 2015 +0100
Add a patch to fix vesa int10 failure. (LP: #1433198)
diff --git a/debian/changelog b/debian/changelog
index bfa06d9..66888c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.17.1-0ubuntu3) vivid; urgency=medium
+
+ * Add a patch to fix vesa int10 failure. (LP: #1433198)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 19 Mar 2015 10:13:08 +0100
+
xorg-server (2:1.17.1-0ubuntu2) vivid; urgency=medium
* Use conflicts/replaces on modesetting.
diff --git a/debian/patches/fix-int10.patch b/debian/patches/fix-int10.patch
new file mode 100644
index 0000000..5f7e5cd
--- /dev/null
+++ b/debian/patches/fix-int10.patch
@@ -0,0 +1,42 @@
+From: Jürg Billeter <j@bitron.ch>
+To: xorg-devel@lists.x.org
+Subject: [PATCH xserver] int10: Fix error check for pci_device_map_legacy
+Date: Sat, 7 Feb 2015 18:13:21 +0100
+Message-Id: <1423329201-32163-1-git-send-email-j@bitron.ch>
+List-Id: "X.Org development list" <xorg-devel.lists.x.org>
+
+pci_device_map_legacy returns 0 on success.
+
+Signed-off-by: Jürg Billeter <j@bitron.ch>
+---
+ hw/xfree86/int10/generic.c | 2 +-
+ hw/xfree86/os-support/linux/int10/linux.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
+index 012d194..8d5c4da 100644
+--- a/hw/xfree86/int10/generic.c
++++ b/hw/xfree86/int10/generic.c
+@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
+ {
+ void *map;
+
+- if (!pci_device_map_legacy(dev, 0, len, 0, &map))
++ if (pci_device_map_legacy(dev, 0, len, 0, &map))
+ return FALSE;
+
+ memcpy(buf, map, len);
+diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
+index 79b9a88..6ca118f 100644
+--- a/hw/xfree86/os-support/linux/int10/linux.c
++++ b/hw/xfree86/os-support/linux/int10/linux.c
+@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
+ {
+ void *map;
+
+- if (!pci_device_map_legacy(dev, base, len, 0, &map))
++ if (pci_device_map_legacy(dev, base, len, 0, &map))
+ return FALSE;
+
+ memcpy(buf, map, len);
+-- 2.3.0
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 4b13dcc..771a1a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,6 +35,7 @@ no-nv.patch
# Probably is just papering over issue; needs further analysis
## upstream patches
+fix-int10.patch
# hybrid graphics fixes
228_autobind_gpu.patch
Reply to: