debian/patches/xmir.patch | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit a10095fc97234e859041c32f0351d21c648e2fcc
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Thu Jul 17 10:47:50 2014 +0200
and a third time, still broken with glxgears
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index b2c334c..5cd4c97 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -25,7 +25,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100
--- a/src/intel_device.c
+++ b/src/intel_device.c
-@@ -276,6 +276,27 @@
+@@ -276,6 +276,25 @@
}
#endif
@@ -35,17 +35,15 @@ Date: Wed Jul 24 01:44:30 2013 +0100
+#if XMIR
+ char id[20];
+
++ if (!xorgMir)
++ return -1;
++
+ snprintf(id, sizeof(id),
+ "pci:%04x:%02x:%02x.%d",
+ pci->domain, pci->bus, pci->dev, pci->func);
+ fd = xmir_get_drm_fd(id);
+ if (fd == -1)
+ return -1;
-+
-+ if (*path == NULL) /* XXX Fix Xmir - it knows both the fd and path */
-+ *path = drmGetDeviceNameFromFd(fd);
-+ if (*path == NULL)
-+ fd = -1;
+#endif
+
+ return fd;
@@ -53,7 +51,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100
#if defined(ODEV_ATTRIB_FD)
static int get_fd(struct xf86_platform_device *dev)
-@@ -328,7 +349,9 @@
+@@ -328,7 +347,9 @@
master_count = 1; /* DRM_MASTER is managed by Xserver */
fd = get_fd(platform);
if (fd == -1) {
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1x7hm9-0007na...@moszumanska.debian.org
