xorg-server: Changes to 'ubuntu+1'
debian/changelog | 15 ++
debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff | 70 ++++++++++
debian/patches/series | 1
debian/patches/xmir.patch | 22 ---
4 files changed, 92 insertions(+), 16 deletions(-)
New commits:
commit 61e8748c7bc97a7fdc350ea8787e0205995e2f21
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Feb 25 11:50:31 2016 +0200
upload to staging ppa
diff --git a/debian/changelog b/debian/changelog
index d6c20e7..18cd204 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.18.1-1ubuntu3) UNRELEASED; urgency=medium
+xorg-server (2:1.18.1-1ubuntu3) xenial; urgency=medium
* Merge xmir changes from 2:1.17.3-2ubuntu4.
* fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter
crash with nvidia prime.
- -- Timo Aaltonen <tjaalton@debian.org> Fri, 19 Feb 2016 12:02:30 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 25 Feb 2016 11:49:23 +0200
xorg-server (2:1.18.1-1ubuntu2) xenial; urgency=medium
commit d99c495632d9bf762fa88ae04f241e42f0b96c0a
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Feb 25 11:49:13 2016 +0200
fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter crash with nvidia prime.
diff --git a/debian/changelog b/debian/changelog
index 7fc8d2b..d6c20e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.18.1-1ubuntu3) UNRELEASED; urgency=medium
* Merge xmir changes from 2:1.17.3-2ubuntu4.
+ * fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter
+ crash with nvidia prime.
-- Timo Aaltonen <tjaalton@debian.org> Fri, 19 Feb 2016 12:02:30 +0200
diff --git a/debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff b/debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff
new file mode 100644
index 0000000..cf253d0
--- /dev/null
+++ b/debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff
@@ -0,0 +1,70 @@
+commit 7bb64d8c1de9659f11da7917772919b071e9db82
+Author: Jan Burgmeier <jan.burgmeier@unicon-software.com>
+Date: Thu Feb 4 14:06:43 2016 +0100
+
+ Fix XineramaQueryScreens for reverse prime
+
+ Make sure we account for slave CRTCs when building the monitor list,
+ since that's what rrxinerama uses to fake Xinerama geometry.
+
+ [ajax: Slightly more informative commit message.]
+
+ Bugzilla: https://bugs.freedesktop.org/92313
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
+index c37dcf8..58041bb 100644
+--- a/randr/rrmonitor.c
++++ b/randr/rrmonitor.c
+@@ -326,7 +326,7 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret,
+ RRMonitorSetFromClient(pScrPriv->monitors[list.client_primary], mon);
+ mon++;
+ } else if (list.server_primary >= 0) {
+- RRMonitorSetFromServer(pScrPriv->crtcs[list.server_primary], mon);
++ RRMonitorSetFromServer(list.server_crtc[list.server_primary], mon);
+ mon++;
+ }
+
+@@ -354,8 +354,8 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret,
+
+ /* And finish with the list of crtc-inspired monitors
+ */
+- for (c = 0; c < pScrPriv->numCrtcs; c++) {
+- RRCrtcPtr crtc = pScrPriv->crtcs[c];
++ for (c = 0; c < list.num_crtcs; c++) {
++ RRCrtcPtr crtc = list.server_crtc[c];
+ if (c == list.server_primary && list.client_primary < 0)
+ continue;
+
+diff --git a/randr/rroutput.c b/randr/rroutput.c
+index d12b9ba..686ae49 100644
+--- a/randr/rroutput.c
++++ b/randr/rroutput.c
+@@ -543,6 +543,7 @@ ProcRRSetOutputPrimary(ClientPtr client)
+ WindowPtr pWin;
+ rrScrPrivPtr pScrPriv;
+ int ret;
++ ScreenPtr slave;
+
+ REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);
+
+@@ -565,8 +566,19 @@ ProcRRSetOutputPrimary(ClientPtr client)
+
+ pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);
+ if (pScrPriv)
++ {
+ RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output);
+
++ xorg_list_for_each_entry(slave,
++ &pWin->drawable.pScreen->output_slave_list,
++ output_head) {
++ rrScrPrivPtr pSlavePriv;
++ pSlavePriv = rrGetScrPriv(slave);
++
++ RRSetPrimaryOutput(slave, pSlavePriv, output);
++ }
++ }
++
+ return Success;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index d3b62d0..6ee13f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,3 +50,4 @@ xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
xmir-fixes.diff
+fix-xineramaqueryscreens-for-reverse-prime.diff
commit 15cc6a09a9b794bb85ad46c654c2c7e179df34ba
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Feb 19 12:04:16 2016 +0200
update the changelog
diff --git a/debian/changelog b/debian/changelog
index c90c5f3..7fc8d2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.1-1ubuntu3) UNRELEASED; urgency=medium
+
+ * Merge xmir changes from 2:1.17.3-2ubuntu4.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 19 Feb 2016 12:02:30 +0200
+
xorg-server (2:1.18.1-1ubuntu2) xenial; urgency=medium
* Merge xmir changes from 2:1.17.3-2ubuntu3.
commit b8fa2c2ad4c2e8f27366f5f17eb6cc123ef61caf
Author: Robert Ancell <robert.ancell@canonical.com>
Date: Tue Feb 16 09:39:21 2016 -0800
* debian/patches/xmir.patch:
- Revert swapinterval 0 change
diff --git a/debian/changelog b/debian/changelog
index e7fc71b..7730b22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.3-2ubuntu4) xenial; urgency=medium
+
+ * debian/patches/xmir.patch:
+ - Revert swapinterval 0 change
+
+ -- Robert Ancell <robert.ancell@canonical.com> Tue, 16 Feb 2016 09:35:17 -0800
+
xorg-server (2:1.17.3-2ubuntu3) xenial; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index aa7d1a7..af257ce 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From 47d65374fdc820777aaf84018574b8ce0d303dac Mon Sep 17 00:00:00 2001
+From efc26decfbefc45cdb36110c019272fbaf41284f Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Fri, 15 May 2015 14:58:59 +1200
Subject: [PATCH 1/3] XMir DDX
@@ -24,11 +24,11 @@ Contributions from:
hw/xmir/xmir-dri2.c | 545 +++++++++++++++
hw/xmir/xmir-glamor.c | 1173 ++++++++++++++++++++++++++++++++
hw/xmir/xmir-input.c | 566 ++++++++++++++++
- hw/xmir/xmir-output.c | 449 ++++++++++++
+ hw/xmir/xmir-output.c | 449 +++++++++++++
hw/xmir/xmir-thread-proxy.c | 109 +++
- hw/xmir/xmir.c | 1574 +++++++++++++++++++++++++++++++++++++++++++
+ hw/xmir/xmir.c | 1564 +++++++++++++++++++++++++++++++++++++++++++
hw/xmir/xmir.h | 226 +++++++
- 18 files changed, 7735 insertions(+), 2 deletions(-)
+ 18 files changed, 7725 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -6120,10 +6120,10 @@ index 0000000..dbb187f
+}
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
new file mode 100644
-index 0000000..12abaef
+index 0000000..033ae92
--- /dev/null
+++ b/hw/xmir/xmir.c
-@@ -0,0 +1,1574 @@
+@@ -0,0 +1,1564 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -6908,16 +6908,6 @@ index 0000000..12abaef
+ xmir_screen->flatten_top = xmir_window;
+ mir_surface_set_event_handler(xmir_window->surface, xmir_surface_handle_event, xmir_window);
+
-+ /*
-+ * Traditional X apps actually get zero throttling, so an interval of
-+ * zero is most appropriate, and of course avoids lag and provides
-+ * maximum frame rates.
-+ * This does however overclock DRI2 GLX clients who want an interval of
-+ * one, but they are a tiny minority and much less important than
-+ * minimizing lag right now. We'll fix that later. (LP: #1211186)
-+ */
-+ mir_surface_set_swapinterval(xmir_window->surface, 0);
-+
+ xmir_window_enable_damage_tracking(xmir_window);
+
+ if (xmir_screen->glamor)
Reply to: