xorg-server: Changes to 'ubuntu'
debian/changelog | 19 ++++++++++++++++++
debian/control | 14 +++++++++++--
debian/patches/fix-ftbfs-ppc64el.patch | 13 ++++++++++++
debian/patches/series | 4 ++-
debian/patches/xf86-ignore-conflicting-rr-caps.patch | 20 +++++++++++++++++++
5 files changed, 67 insertions(+), 3 deletions(-)
New commits:
commit d9c4d93f1488f3c9a21d42d19631f1b924ff00fd
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Feb 13 14:15:11 2014 +0100
fix ftbfs on ppc64el and add breaks/replaces in xserver-common
diff --git a/debian/changelog b/debian/changelog
index 736daa3..ce8e09d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xorg-server (2:1.15.0-1ubuntu6) trusty; urgency=low
+
+ * Add a small patch to hopefully fix FTBFS on ppc64el.
+ * Add breaks/replaces on xserver-common-lts-* to fix upgrades from precise.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 13 Feb 2014 14:06:11 +0100
+
+xorg-server (2:1.15.0-1ubuntu5) trusty; urgency=medium
+
+ * Another no-change rebuild against latest Mir
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Wed, 12 Feb 2014 18:33:20 +0100
+
xorg-server (2:1.15.0-1ubuntu4) trusty; urgency=low
* Only set RR caps that are appropriate to main/gpu screen. (LP: #1277014)
diff --git a/debian/control b/debian/control
index e24d8a7..f3480dc 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,7 @@ Build-Depends:
# getpeereid()
libbsd-dev [kfreebsd-any],
# XMir
- libmirclient-dev (>= 0.0.8+13.10.20130803) [!arm64 !powerpc !ppc64el],
+ libmirclient-dev (>= 0.1.5) [!arm64 !powerpc !ppc64el],
libatomic-ops-dev,
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
@@ -352,7 +352,17 @@ Depends:
Recommends:
xfonts-base,
xauth,
-Replaces: xserver-xorg-core (<< 2:1.5.2)
+Breaks:
+ xserver-common-lts-quantal (<< 3:0),
+ xserver-common-lts-raring (<< 3:0),
+ xserver-common-lts-saucy (<< 3:0),
+ xserver-common-lts-trusty (<< 3:0),
+Replaces:
+ xserver-common-lts-quantal (<< 3:0),
+ xserver-common-lts-raring (<< 3:0),
+ xserver-common-lts-saucy (<< 3:0),
+ xserver-common-lts-trusty (<< 3:0),
+ xserver-xorg-core (<< 2:1.5.2)
Description: common files used by various X servers
This package provides files necessary for all X.Org based X servers.
diff --git a/debian/patches/fix-ftbfs-ppc64el.patch b/debian/patches/fix-ftbfs-ppc64el.patch
new file mode 100644
index 0000000..f188ac8
--- /dev/null
+++ b/debian/patches/fix-ftbfs-ppc64el.patch
@@ -0,0 +1,13 @@
+diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
+index a9a9fa5..f88cdc0 100644
+--- a/hw/kdrive/src/kinput.c
++++ b/hw/kdrive/src/kinput.c
+@@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close)
+ if (do_close)
+ close(kdInputFds[i].fd);
+ kdNumInputFds--;
+- for (j = i; j < (kdNumInputFds - 1); j++)
++ for (j = i; j < (kdNumInputFds - 1) && j < (KD_MAX_INPUT_FDS - 1); j++)
+ kdInputFds[j] = kdInputFds[j + 1];
+ break;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index ca99580..f033d85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,5 +45,6 @@ rrcrtc-brackets-are-hard.patch
config-add-no-removal.patch
xf86-ignore-conflicting-rr-caps.patch
-xmir.patch
pixman-validate.patch
+fix-ftbfs-ppc64el.patch
+xmir.patch
commit 91c445bc8b5d43d3531324e238f0cb4c513f1f1a
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Feb 10 18:51:30 2014 +0100
release to trusty
diff --git a/debian/changelog b/debian/changelog
index b5d8f02..736daa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.15.0-1ubuntu4) UNRELEASED; urgency=low
+xorg-server (2:1.15.0-1ubuntu4) trusty; urgency=low
* Only set RR caps that are appropriate to main/gpu screen. (LP: #1277014)
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 10 Feb 2014 16:45:13 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 10 Feb 2014 18:51:19 +0100
xorg-server (2:1.15.0-1ubuntu3) trusty; urgency=low
commit 4b1537a61e412cab50e4e673cde5b8449055147b
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Feb 10 18:51:07 2014 +0100
Only set RR caps that are appropriate to main/gpu screen. (LP: #1277014)
diff --git a/debian/changelog b/debian/changelog
index 74ff76f..b5d8f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.0-1ubuntu4) UNRELEASED; urgency=low
+
+ * Only set RR caps that are appropriate to main/gpu screen. (LP: #1277014)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 10 Feb 2014 16:45:13 +0100
+
xorg-server (2:1.15.0-1ubuntu3) trusty; urgency=low
* No-change rebuild against correct libgcrypt.
diff --git a/debian/patches/series b/debian/patches/series
index df7d837..ca99580 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,6 +43,7 @@ xf86-inactive-gpuscreen.patch
xrandr-rroutputchanged-main.patch
rrcrtc-brackets-are-hard.patch
config-add-no-removal.patch
+xf86-ignore-conflicting-rr-caps.patch
xmir.patch
pixman-validate.patch
diff --git a/debian/patches/xf86-ignore-conflicting-rr-caps.patch b/debian/patches/xf86-ignore-conflicting-rr-caps.patch
new file mode 100644
index 0000000..162a30f
--- /dev/null
+++ b/debian/patches/xf86-ignore-conflicting-rr-caps.patch
@@ -0,0 +1,20 @@
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -1569,10 +1569,16 @@
+ }
+
+ if (config->name) {
++ uint32_t caps = pScrn->capabilities;
+ config->randr_provider = RRProviderCreate(pScreen, config->name,
+ strlen(config->name));
+
+- RRProviderSetCapabilities(config->randr_provider, pScrn->capabilities);
++ if (!pScreen->isGPU)
++ caps &= RR_Capability_SinkOffload | RR_Capability_SourceOutput;
++ else
++ caps &= RR_Capability_SourceOffload | RR_Capability_SinkOutput;
++
++ RRProviderSetCapabilities(config->randr_provider, caps);
+ }
+
+ return TRUE;
Reply to: