xorg-server: Changes to 'ubuntu-xenial'
debian/changelog | 7 ++++
debian/patches/modesetting-unifdef-slave-support.diff | 27 ++++++++++++++++++
debian/patches/series | 1
3 files changed, 35 insertions(+)
New commits:
commit c298cd3025885e9acd02741c2ec678f3e3a56e9e
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Nov 1 10:15:05 2016 +0200
release to xenial
diff --git a/debian/changelog b/debian/changelog
index bf8b164..cd6b1f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.18.4-0ubuntu0.2) UNRELEASED; urgency=medium
+xorg-server (2:1.18.4-0ubuntu0.2) xenial; urgency=medium
* modesetting-unifdef-slave-support.diff: Fix modesetting slave output
names. (LP: #1636397)
- -- Timo Aaltonen <tjaalton@debian.org> Tue, 01 Nov 2016 10:08:27 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 01 Nov 2016 10:08:51 +0200
xorg-server (2:1.18.4-0ubuntu0.1) xenial; urgency=medium
commit dfab9afd78023d1c6e6d55a8e383af377f957f73
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Nov 1 10:08:49 2016 +0200
modesetting-unifdef-slave-support.diff: Fix modesetting slave output names. (LP: #1636397)
diff --git a/debian/changelog b/debian/changelog
index 2e0673d..bf8b164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.4-0ubuntu0.2) UNRELEASED; urgency=medium
+
+ * modesetting-unifdef-slave-support.diff: Fix modesetting slave output
+ names. (LP: #1636397)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 01 Nov 2016 10:08:27 +0200
+
xorg-server (2:1.18.4-0ubuntu0.1) xenial; urgency=medium
* New upstream bugfix release. (LP: #1619142)
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 <nmahale@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 <nmahale@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 561db5a..6a2bebd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,3 +50,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
Reply to: