debian/changelog | 7 ++++
debian/patches/modesetting-unifdef-slave-support.diff | 27 ++++++++++++++++++
debian/patches/series | 1
3 files changed, 35 insertions(+)
New commits:
commit 2efc41eee297e9ef4373dccf672cfbb79c6fdf29
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Oct 25 10:49:18 2016 +0300
release to zesty
diff --git a/debian/changelog b/debian/changelog
index 45c696b..0e09110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.18.4-1ubuntu7) UNRELEASED; urgency=medium
+xorg-server (2:1.18.4-1ubuntu7) zesty; urgency=medium
* modesetting-unifdef-slave-support.diff: Fix modesetting slave output
names. (LP: #1636397)
- -- Timo Aaltonen <tjaal...@debian.org> Tue, 25 Oct 2016 10:47:08 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Tue, 25 Oct 2016 10:48:45 +0300
xorg-server (2:1.18.4-1ubuntu6) yakkety; urgency=medium
commit b66de0dfa0e16a6f1d35dd04b3a2fa8cd2094dfa
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Oct 25 10:48:43 2016 +0300
modesetting-unifdef-slave-support.diff: Fix modesetting slave output names.
(LP: #1636397)
diff --git a/debian/changelog b/debian/changelog
index e9f5cb4..45c696b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.4-1ubuntu7) UNRELEASED; urgency=medium
+
+ * modesetting-unifdef-slave-support.diff: Fix modesetting slave output
+ names. (LP: #1636397)
+
+ -- Timo Aaltonen <tjaal...@debian.org> Tue, 25 Oct 2016 10:47:08 +0300
+
xorg-server (2:1.18.4-1ubuntu6) yakkety; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/modesetting-unifdef-slave-support.diff
b/debian/patches/modesetting-unifdef-slave-support.diff
new file mode 100644
index 0000000..804aaf1
--- /dev/null
+++ b/debian/patches/modesetting-unifdef-slave-support.diff
@@ -0,0 +1,27 @@
+Subject: [PATCH xserver] modesetting: unifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
+From: Nikhil Mahale <nmah...@nvidia.com>
+Date: 22.10.2016 15:10
+
+Commit c7e8d4a6ee9542f56cd241cf7a960fb8223a6b22 had already
+unifdef MODESETTING_OUTPUT_SLAVE_SUPPORT but commit
+9257b1252da9092ddc676fec9aabe2b33dfad272 didn't
+notice that.
+
+Signed-off-by: Nikhil Mahale <nmah...@nvidia.com>
+---
+ hw/xfree86/drivers/modesetting/drmmode_display.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
+@@ -1401,10 +1401,8 @@ drmmode_create_name(ScrnInfoPtr pScrn, d
+ fallback:
+ if (koutput->connector_type >= MS_ARRAY_SIZE(output_names))
+ snprintf(name, 32, "Unknown%d-%d", koutput->connector_type,
koutput->connector_type_id);
+-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
+ else if (pScrn->is_gpu)
+ snprintf(name, 32, "%s-%d-%d", output_names[koutput->connector_type],
pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1, koutput->connector_type_id);
+-#endif
+ else
+ snprintf(name, 32, "%s-%d", output_names[koutput->connector_type],
koutput->connector_type_id);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 0fbbe54..be3c87a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -52,3 +52,4 @@ xmir-desktop-file-hint-flag.patch
xi2-resize-touch.patch
randr-adjust-masters-last-set-time.diff
randr-do-not-check-the-screen-size.diff
+modesetting-unifdef-slave-support.diff
