xorg-server: Changes to 'ubuntu'
debian/changelog | 5 +
debian/patches/series | 7 --
debian/patches/xrandr-rroutputchanged-main.patch | 62 +++++++++++++++++++++++
3 files changed, 67 insertions(+), 7 deletions(-)
New commits:
commit f552c6766710c4acb911c325db18d1ae571ed593
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Dec 10 15:09:16 2013 +0100
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 87f94d8..773dbf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.14.4.901-0ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.14.4.901-0ubuntu1) trusty; urgency=low
* New upstream release with some optimus fixes.
* Include a patch to fix gpu screen output hotplugging. (LP: #1259561)
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 05 Dec 2013 10:20:54 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 10 Dec 2013 15:09:07 +0100
xorg-server (2:1.14.4-1ubuntu1) trusty; urgency=low
commit 748e24d0b77ae64eb0b55c2cd05ff05c3d69c51d
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Dec 10 15:08:48 2013 +0100
Include a patch to fix gpu screen output hotplugging. (LP: #1259561)
diff --git a/debian/changelog b/debian/changelog
index c0fa970..87f94d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.14.4.901-0ubuntu1) UNRELEASED; urgency=low
* New upstream release with some optimus fixes.
+ * Include a patch to fix gpu screen output hotplugging. (LP: #1259561)
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 05 Dec 2013 10:20:54 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 3b0b8b5..c6fc055 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,14 +39,11 @@ no-nv.patch
## upstream patches
-# hybrid graphics fixes for xserver 1.13
+# hybrid graphics fixes
228_autobind_gpu.patch
xf86-fixup-detection.patch
xf86-inactive-gpuscreen.patch
-
-# hotplug fixes
-
-# fixes for reverse optimus, cherry-picked from fedora X
+xrandr-rroutputchanged-main.patch
rrcrtc-brackets-are-hard.patch
config-add-no-removal.patch
diff --git a/debian/patches/xrandr-rroutputchanged-main.patch b/debian/patches/xrandr-rroutputchanged-main.patch
new file mode 100644
index 0000000..5affb72
--- /dev/null
+++ b/debian/patches/xrandr-rroutputchanged-main.patch
@@ -0,0 +1,62 @@
+From: Alberto Milone <alberto.milone@canonical.com>
+Subject: [PATCH 1/1] randr: make RROutputChanged change the main protocol screen not the gpu screen
+Date: Sun, 8 Dec 2013 12:08:41 +0100
+Message-Id: <1386500921-20165-1-git-send-email-alberto.milone@canonical.com>
+
+We only set changes on the main protocol screen as, for example
+in RRSetChanged() and RRTellChanged(), therefore we should follow
+the same logic when reporting that an output changed in
+RROutputChanged().
+
+This means that RRTellChanged() will then update the relevant
+timestamps also when events come from gpu screens.
+
+Signed-off-by: Alberto Milone <alberto.milone@canonical.com>
+---
+ randr/rroutput.c | 26 +++++++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/randr/rroutput.c b/randr/rroutput.c
+index 2b0b82f..8229046 100644
+--- a/randr/rroutput.c
++++ b/randr/rroutput.c
+@@ -31,15 +31,31 @@ RESTYPE RROutputType;
+ void
+ RROutputChanged(RROutputPtr output, Bool configChanged)
+ {
++ /* set changed bits on the master screen only */
+ ScreenPtr pScreen = output->pScreen;
+
+ output->changed = TRUE;
+- if (pScreen) {
+- rrScrPriv(pScreen);
+- RRSetChanged(pScreen);
+- if (configChanged)
+- pScrPriv->configChanged = TRUE;
++ if (!pScreen)
++ return;
++
++ ScreenPtr master;
++ rrScrPriv(pScreen);
++ rrScrPrivPtr mastersp;
++
++ if (pScreen->isGPU) {
++ master = pScreen->current_master;
++ if (!master)
++ return;
++ mastersp = rrGetScrPriv(master);
+ }
++ else {
++ master = pScreen;
++ mastersp = pScrPriv;
++ }
++
++ RRSetChanged(pScreen);
++ if (configChanged)
++ mastersp->configChanged = TRUE;
+ }
+
+ /*
+--
+1.7.9.5
+
Reply to: