xorg-server: Changes to 'ubuntu-xenial'
Rebased ref, commits from common ancestor:
commit deb5813a5c20feaa0b3b5d83426075893c5d4d3d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Jul 25 12:06:57 2017 +0300
disable-rotation-transform-gpuscreens.patch: Dropped, NVIDIA driver supports rotation now. (LP: #1706287)
diff --git a/debian/changelog b/debian/changelog
index 6d134ec..961ed83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.18.4-0ubuntu0.3) xenial; urgency=medium
* control: Build against libxfont1-dev. (LP: #1687981)
+ * disable-rotation-transform-gpuscreens.patch: Dropped, NVIDIA driver
+ supports rotation now. (LP: #1706287)
-- Timo Aaltonen <tjaalton@debian.org> Mon, 26 Jun 2017 14:53:19 +0300
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch b/debian/patches/disable-rotation-transform-gpuscreens.patch
deleted file mode 100644
index e62a133..0000000
--- a/debian/patches/disable-rotation-transform-gpuscreens.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Disable support for rotations and transforms on gpu screens.
-Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
-Bug-Ubuntu: https://launchpad.net/bugs/1386620
-Bug-Ubuntu: https://launchpad.net/bugs/1308515
-Bug-Ubuntu: https://launchpad.net/bugs/1489696
-
---- a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -922,6 +922,9 @@ xf86RandR12SetRotations(ScreenPtr pScree
- if (xf86RandR12Key == NULL)
- return;
-
-+ if (pScreen->isGPU)
-+ rotations = RR_Rotate_0;
-+
- randrp = XF86RANDRINFO(pScreen);
- #if RANDR_12_INTERFACE
- for (c = 0; c < config->num_crtc; c++) {
-@@ -942,6 +945,9 @@ xf86RandR12SetTransformSupport(ScreenPtr
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- #endif
-
-+ if (pScreen->isGPU)
-+ transforms = FALSE;
-+
- if (xf86RandR12Key == NULL)
- return;
-
diff --git a/debian/patches/series b/debian/patches/series
index 6a2bebd..3facf44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,7 +43,6 @@ xf86-inactive-gpuscreen.patch
config-add-no-removal.patch
xf86-ignore-conflicting-rr-caps.patch
fix-detach-gpu.patch
-disable-rotation-transform-gpuscreens.patch
xmir.patch
xmir-desktop-file-hint-flag.patch
commit a1016520ba7e5c5b3557889eace675f291e816a4
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jun 30 09:44:44 2017 +0300
control: Build against libxfont1-dev. (LP: #1687981)
diff --git a/debian/changelog b/debian/changelog
index cd6b1f9..6d134ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.4-0ubuntu0.3) xenial; urgency=medium
+
+ * control: Build against libxfont1-dev. (LP: #1687981)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 26 Jun 2017 14:53:19 +0300
+
xorg-server (2:1.18.4-0ubuntu0.2) xenial; urgency=medium
* modesetting-unifdef-slave-support.diff: Fix modesetting slave output
diff --git a/debian/control b/debian/control
index 9843ce2..f873459 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Build-Depends:
x11proto-input-dev (>= 2.3),
x11proto-dri2-dev (>= 2.8),
libxdmcp-dev (>= 1:0.99.1),
- libxfont-dev (>= 1:1.4.2),
+ libxfont1-dev (>= 1:1.4.2),
libxkbfile-dev (>= 1:0.99.1),
libpixman-1-dev (>= 0.27.2),
libpciaccess-dev (>= 0.12.901),
@@ -220,7 +220,7 @@ Depends:
x11proto-xf86bigfont-dev (>= 1.2.0),
x11proto-dri3-dev,
x11proto-present-dev,
- libxfont-dev,
+ libxfont1-dev,
libxkbfile-dev,
libpciaccess-dev,
mesa-common-dev,
Reply to: