xorg-server: Changes to 'ubuntu+1'
debian/patches/drm_device_keep_trying.patch | 10 ++++++++--
debian/patches/series | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 7c8629f9af0bd2db54d5fbc0c88a7239cba2c545
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jun 25 11:02:27 2014 +0200
disable xmir patch for now
diff --git a/debian/patches/series b/debian/patches/series
index 5e74491..f6b2b6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,7 +49,7 @@ disable-rotation-transform-gpuscreens.patch
pixman-validate.patch
fix-ftbfs-ppc64el.patch
-xmir.patch
+#xmir.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
mi-dont-process-disabled.patch
commit 6010f051924cdaf3b2739831099593ce216cb578
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jun 25 11:02:00 2014 +0200
fixup drm_device_keep_trying.patch
diff --git a/debian/patches/drm_device_keep_trying.patch b/debian/patches/drm_device_keep_trying.patch
index ea36cf9..7f7c935 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -30,7 +30,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
config_udev_odev_setup_attribs(path, syspath, major(devnum),
minor(devnum), NewGPUDeviceRequest);
-@@ -456,6 +456,17 @@
+@@ -456,18 +456,55 @@
#ifdef CONFIG_UDEV_KMS
@@ -48,7 +48,13 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
static void
config_udev_odev_setup_attribs(const char *path, const char *syspath,
int major, int minor,
-@@ -468,6 +479,31 @@
+ config_odev_probe_proc_ptr probe_callback)
+ {
+ struct OdevAttributes *attribs = config_odev_allocate_attribute_list();
++ const char *platform;
+
+ config_odev_add_attribute(attribs, ODEV_ATTRIB_PATH, path);
+ config_odev_add_attribute(attribs, ODEV_ATTRIB_SYSPATH, syspath);
config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major);
config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor);
Reply to: