xorg-server: Changes to 'ubuntu'
debian/changelog | 13
debian/patches/xmir-desktop-file-hint-flag.patch | 22
debian/patches/xmir.patch| 576 +++
3 files changed, 410 insertions(+), 201 deletions(-)
New commits:
commit 6a23f1b3237dad65d3f1c3c3616ca91d1822bcf3
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Thu Nov 17 15:26:39 2016 +1300
* debian/patches/xmir.patch:
* debian/patches/xmir-desktop-file-hint-flag.patch:
- Refresh
- Fix warnings when built against lp:mir/0.25
- Support both Mir 0.24 and 0.25 client APIs
- Fix crashing on arm64 (LP: #1642297)
diff --git a/debian/changelog b/debian/changelog
index 5941a97..716e323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.99.902-1ubuntu2) UNRELEASED; urgency=medium
+ [ Timo Aaltonen ]
* Merge from Debian experimental.
- Patches refreshed
- randr-adjust-masters-last-set-time.diff,
@@ -16,7 +17,15 @@ xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED;
urgency=medium
already, no need to carry a duplicate check.
* xmir.patch: Don't check for aiglx enable flag, dropped upstream.
- -- Timo Aaltonen <tjaal...@debian.org> Tue, 08 Nov 2016 12:48:29 +0200
+ [ Robert Ancell ]
+ * debian/patches/xmir.patch:
+ * debian/patches/xmir-desktop-file-hint-flag.patch:
+- Refresh
+- Fix warnings when built against lp:mir/0.25
+- Support both Mir 0.24 and 0.25 client APIs
+- Fix crashing on arm64 (LP: #1642297)
+
+ -- Robert Ancell <robert.anc...@canonical.com> Thu, 17 Nov 2016 15:25:26
+1300
xorg-server (2:1.18.99.902-1) experimental; urgency=medium
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
index 4930b55..d41afbc 100644
--- a/debian/patches/xmir-desktop-file-hint-flag.patch
+++ b/debian/patches/xmir-desktop-file-hint-flag.patch
@@ -1,22 +1,28 @@
-From de9e6e1d66680e717471df2c4032e590fd1b9ae0 Mon Sep 17 00:00:00 2001
+From 9d15629dd3cdddec47f873d7bb14ed5e27f621ca Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.anc...@canonical.com>
Date: Fri, 29 Apr 2016 14:58:28 +0200
Subject: [PATCH xserver 2/3] xmir: Ignore --desktop_file_hint flag required by
Unity8 to decide which application is starting
---
- hw/xmir/xmir.c | 3 +++
- 1 file changed, 3 insertions(+)
+ hw/xmir/xmir.c | 4
+ 1 file changed, 4 insertions(+)
+diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
+index 81b0b34..332e22e 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
-@@ -178,6 +178,9 @@ ddxProcessArgument(int argc, char *argv[
- } else if (!strcmp(argv[i], "-novtswitch") ||
+@@ -180,6 +180,10 @@ ddxProcessArgument(int argc, char *argv[], int i)
+ else if (!strcmp(argv[i], "-novtswitch") ||
!strncmp(argv[i], "vt", 2)) {
return 1;
+/* Bypass unity8 "security" */
-+} else if (!strncmp(argv[i], "--desktop_file_hint=",
strlen("--desktop_file_hint="))) {
++}
++else if (!strncmp(argv[i], "--desktop_file_hint=",
strlen("--desktop_file_hint="))) {
+return 1;
- } else if (!strcmp(argv[i], "-fd")) {
+ }
+ else if (!strcmp(argv[i], "-fd")) {
if (!seen_shared)
- NoListenAll = 1;
+--
+2.10.2
+
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 1d9aa40..d4fbdb2 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From 8467ede06b3b40fae1d362d73cfa313737e0defc Mon Sep 17 00:00:00 2001
+From 4d62680bb8961651be15732cc815bf8cff2535ef Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.anc...@canonical.com>
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -16,20 +16,20 @@ Contributions from:
hw/xmir/.gitignore |1 +
hw/xmir/Makefile.am | 61 ++
hw/xmir/dri2/Makefile.am| 14 +
- hw/xmir/dri2/dri2.c | 1398 ++
+ hw/xmir/dri2/dri2.c | 1398 +
hw/xmir/dri2/dri2.h | 364 +
hw/xmir/dri2/dri2ext.c | 683 +
hw/xmir/dri2/dri2int.h | 26 +
- hw/xmir/xmir-cursor.c | 210 ++
+ hw/xmir/xmir-cursor.c | 223 ++
hw/xmir/xmir-cvt.c | 304
- hw/xmir/xmir-dri2.c | 551 ++
- hw/xmir/xmir-glamor.c | 1164 +
- hw/xmir/xmir-input.c| 611 +++
- hw/xmir/xmir-output.c | 476
- hw/xmir/xmir-thread-proxy.c | 115 +++
- hw/xmir/xmir.c | 1729 +++
+ hw/xmir/xmir-dri2.c | 558 ++
+ hw/xmir/xmir-glamor.c | 1174
+ hw/xmir/
xorg-server: Changes to 'ubuntu'
debian/changelog | 10
debian/patches/xmir.patch | 110 ++
2 files changed, 93 insertions(+), 27 deletions(-)
New commits:
commit 8891b9fe356a24117ce5c7b601f65fad2d000d93
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Wed Sep 7 17:07:32 2016 +1200
* debian/patches/xmir.patch:
- Don't call epoxy every frame (LP: #1617932)
- Ignore 'unknown 11 event' (LP: #1617925)
- Improve root window resizing code
- Make randr mode names simpler
diff --git a/debian/changelog b/debian/changelog
index 94e955b..e9f5cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.18.4-1ubuntu6) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Don't call epoxy every frame (LP: #1617932)
+- Ignore 'unknown 11 event' (LP: #1617925)
+- Improve root window resizing code
+- Make randr mode names simpler
+
+ -- Robert Ancell <robert.anc...@canonical.com> Wed, 07 Sep 2016 15:50:30
+1200
+
xorg-server (2:1.18.4-1ubuntu5) yakkety; urgency=medium
* drm_device_keep_trying.patch: Dropped, shouldn't be needed anymore, and
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 411585b..32f19c0 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From f270f91a106d212e5b4a920a64e88f56d40a8336 Mon Sep 17 00:00:00 2001
+From 8467ede06b3b40fae1d362d73cfa313737e0defc Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.anc...@canonical.com>
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -23,13 +23,13 @@ Contributions from:
hw/xmir/xmir-cursor.c | 210 ++
hw/xmir/xmir-cvt.c | 304
hw/xmir/xmir-dri2.c | 551 ++
- hw/xmir/xmir-glamor.c | 1160 +
- hw/xmir/xmir-input.c| 609 +++
- hw/xmir/xmir-output.c | 428 +++
+ hw/xmir/xmir-glamor.c | 1164 +
+ hw/xmir/xmir-input.c| 611 +++
+ hw/xmir/xmir-output.c | 476
hw/xmir/xmir-thread-proxy.c | 115 +++
hw/xmir/xmir.c | 1729 +++
- hw/xmir/xmir.h | 230 ++
- 18 files changed, 7915 insertions(+), 2 deletions(-)
+ hw/xmir/xmir.h | 232 ++
+ 18 files changed, 7971 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -3806,10 +3806,10 @@ index 000..e1d02f0
+}
diff --git a/hw/xmir/xmir-glamor.c b/hw/xmir/xmir-glamor.c
new file mode 100644
-index 000..7ad0245
+index 000..61d4c10
--- /dev/null
+++ b/hw/xmir/xmir-glamor.c
-@@ -0,0 +1,1160 @@
+@@ -0,0 +1,1164 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -4169,7 +4169,8 @@ index 000..7ad0245
+struct xmir_screen *xmir_screen = xmir_screen_get(src->pScreen);
+DebugF("Box: (%i,%i)->(%i,%i)\n", ext->x1, ext->y1, ext->x2, ext->y2);
+
-+if (epoxy_has_gl_extension("GL_EXT_framebuffer_blit") &&
!xmir_screen->doubled && !orientation) {
++if (xmir_screen->glamor_has_GL_EXT_framebuffer_blit &&
++!xmir_screen->doubled && !orientation) {
+glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT,
src_pixmap_priv->fbo->fb);
+
+glBlitFramebuffer(ext->x1, ext->y2, ext->x2, ext->y1,
@@ -4648,6 +4649,9 @@ index 000..7ad0245
+return FALSE;
+}
+
++xmir_screen->glamor_has_GL_EXT_framebuffer_blit =
++epoxy_has_gl_extension("GL_EXT_framebuffer_blit");
++
+if (!xmir_screen->gbm && xmir_screen->glamor != glamor_egl_sync) {
+xmir_screen->swap_context =
eglCreateContext(xmir_screen->egl_display, egl_config, EGL_NO_CONTEXT,
gles2_attribs);
+if (!xmir_screen->swap_context) {
@@ -4972,10 +4976,10 @@ index 000..7ad0245
+}
diff --git a/hw/xmir/xmir-input.c b/hw/xmir/xmir-input.c
new file mode 100644
-index 000..21b7abe
+index 000..f9887ea
--- /dev/null
+++ b/hw/xmir/xmir-input.c
-@@ -0,0 +1,609 @@
+@@ -0,0 +1,611 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -5527,6 +5531,8 @@ index 000..21b7abe
+case mir_event_type_keymap:
+xmir_handle_keymap_event(xmir_input, mir_event_get_keymap_event(ev));
+break;
++case mir_event_type_input_device_state:
++break;
+default:
+ErrorF("Received an unknown %u event\n", mir_event_get_type(ev));
+break;
@@ -5587,10 +5593,10 @@ index 000..21b7abe
+}
diff --git a/hw/xmir/xmir-output.c b/hw/xmir/xmir-output.c
new file mode 100644
-index 000..1927215
+index 000..860e89b
--- /dev/null
+++ b/hw/xmir/xmir-output.c
-@@ -0,0 +1,428 @@
+@@ -0,0 +1,476 @@
+/
xorg-server: Changes to 'ubuntu'
debian/changelog | 11
debian/patches/xmir.patch | 114 +++---
2 files changed, 80 insertions(+), 45 deletions(-)
New commits:
commit 9932b3a4ba4b36fc896ebe8a8cc5d30c878c6da8
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Thu Jul 28 14:51:17 2016 +1200
* debian/patches/xmir.patch:
- Fix button/menu focus failures (LP: #1590553)
- Implement XWMHints properly
- Add smooth touchpad scroll support (LP: #1603917)
- Fix key repeat order
- Remove links to Unity8 bugs that are now fixed.
diff --git a/debian/changelog b/debian/changelog
index 70d2704..8314f90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.18.4-1ubuntu4) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix button/menu focus failures (LP: #1590553)
+- Implement XWMHints properly
+- Add smooth touchpad scroll support (LP: #1603917)
+- Fix key repeat order
+- Remove links to Unity8 bugs that are now fixed.
+
+ -- Robert Ancell <robert.anc...@canonical.com> Thu, 28 Jul 2016 14:31:22
+1200
+
xorg-server (2:1.18.4-1ubuntu3) yakkety; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index d4eccf3..411585b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From c93f490c0c560c82ffc2dd3b6095f6e390b0fb81 Mon Sep 17 00:00:00 2001
+From f270f91a106d212e5b4a920a64e88f56d40a8336 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.anc...@canonical.com>
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -16,7 +16,7 @@ Contributions from:
hw/xmir/.gitignore |1 +
hw/xmir/Makefile.am | 61 ++
hw/xmir/dri2/Makefile.am| 14 +
- hw/xmir/dri2/dri2.c | 1398 +++
+ hw/xmir/dri2/dri2.c | 1398 ++
hw/xmir/dri2/dri2.h | 364 +
hw/xmir/dri2/dri2ext.c | 683 +
hw/xmir/dri2/dri2int.h | 26 +
@@ -24,12 +24,12 @@ Contributions from:
hw/xmir/xmir-cvt.c | 304
hw/xmir/xmir-dri2.c | 551 ++
hw/xmir/xmir-glamor.c | 1160 +
- hw/xmir/xmir-input.c| 595 +++
+ hw/xmir/xmir-input.c| 609 +++
hw/xmir/xmir-output.c | 428 +++
hw/xmir/xmir-thread-proxy.c | 115 +++
- hw/xmir/xmir.c | 1719 +++
+ hw/xmir/xmir.c | 1729 +++
hw/xmir/xmir.h | 230 ++
- 18 files changed, 7891 insertions(+), 2 deletions(-)
+ 18 files changed, 7915 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -4972,10 +4972,10 @@ index 000..7ad0245
+}
diff --git a/hw/xmir/xmir-input.c b/hw/xmir/xmir-input.c
new file mode 100644
-index 000..e62e16c
+index 000..21b7abe
--- /dev/null
+++ b/hw/xmir/xmir-input.c
-@@ -0,0 +1,595 @@
+@@ -0,0 +1,609 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -5020,7 +5020,7 @@ index 000..e62e16c
+xmir_pointer_proc(DeviceIntPtr device, int what)
+{
+#define NBUTTONS 10
-+#define NAXES 2
++#define NAXES 4
+BYTE map[NBUTTONS + 1];
+int i = 0;
+Atom btn_labels[NBUTTONS] = { 0 };
@@ -5044,8 +5044,10 @@ index 000..e62e16c
+
+axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
++axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_HWHEEL);
++axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_WHEEL);
+
-+if (!InitValuatorClassDeviceStruct(device, 2, btn_labels,
++if (!InitValuatorClassDeviceStruct(device, NAXES, btn_labels,
+ GetMotionHistorySize(), Absolute))
+return BadValue;
+
@@ -5054,6 +5056,13 @@ index 000..e62e16c
+ 0, 0x, 1, 0, 1, Absolute);
+InitValuatorAxisStruct(device, 1, axes_labels[1],
+ 0, 0x, 1, 0, 1, Absolute);
++InitValuatorAxisStruct(device, 2, axes_labels[2],
++ NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0,
Relative);
++InitValuatorAxisStruct(device, 3, axes_labels[3],
++ NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0,
Relative);
++
++SetScrollValuator(device, 2, SCROLL_TYPE_HORIZONTAL, 1.0,
SCROLL_FLAG_NONE);
++SetScrollValuator(device, 3, SCROLL_TYPE_VERTICAL, 1.0,
SCROLL_FLAG_PREFERRED);
+
+if (!InitPtrFeedbackClassDeviceStruct(device, xmir_pointer_control))
+return BadValue;
@@ -5198,7 +5207,7 @@ inde
xorg-server: Changes to 'ubuntu'
debian/changelog | 12 ++ debian/patches/xmir.patch | 248 +++--- 2 files changed, 180 insertions(+), 80 deletions(-) New commits: commit 858b1addb8c1a46c427a6199d7f631ef79af651e Author: Robert Ancell <robert.anc...@canonical.com> Date: Thu Jul 21 15:17:26 2016 +0200 Update xmir.patch diff --git a/debian/changelog b/debian/changelog index ff9b686..70d2704 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +xorg-server (2:1.18.4-1ubuntu3) yakkety; urgency=medium + + * debian/patches/xmir.patch: +- Fix bottom/right edge corruption. (LP: #1510849) +- Fix key repeat. (LP: #1591356) +- Don't delete outputs without replacing them. (LP: #1504422) (LP: #1602561) +- Xmir -debug: Log WM types by name and number. +- Implement fake GLX frame notification/timing. +- Improve focus tracking. + + -- Robert Ancell <robert.anc...@canonical.com> Thu, 21 Jul 2016 11:42:03 +0200 + xorg-server (2:1.18.4-1ubuntu2) yakkety; urgency=medium * debian/control, debian/rules: diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index e7ff8d7..d4eccf3 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -1,4 +1,4 @@ -From eb0fb72f618ea17a90d6c535d38e12b5f95fcec8 Mon Sep 17 00:00:00 2001 +From c93f490c0c560c82ffc2dd3b6095f6e390b0fb81 Mon Sep 17 00:00:00 2001 From: Robert Ancell <robert.anc...@canonical.com> Date: Fri, 29 Apr 2016 14:57:53 +0200 Subject: [PATCH xserver 1/3] XMir DDX @@ -16,20 +16,20 @@ Contributions from: hw/xmir/.gitignore |1 + hw/xmir/Makefile.am | 61 ++ hw/xmir/dri2/Makefile.am| 14 + - hw/xmir/dri2/dri2.c | 1398 + - hw/xmir/dri2/dri2.h | 364 ++ - hw/xmir/dri2/dri2ext.c | 683 ++ + hw/xmir/dri2/dri2.c | 1398 +++ + hw/xmir/dri2/dri2.h | 364 + + hw/xmir/dri2/dri2ext.c | 683 + hw/xmir/dri2/dri2int.h | 26 + hw/xmir/xmir-cursor.c | 210 ++ hw/xmir/xmir-cvt.c | 304 - hw/xmir/xmir-dri2.c | 551 +++ - hw/xmir/xmir-glamor.c | 1160 +++ - hw/xmir/xmir-input.c| 592 - hw/xmir/xmir-output.c | 449 - hw/xmir/xmir-thread-proxy.c | 109 +++ - hw/xmir/xmir.c | 1622 +++ - hw/xmir/xmir.h | 227 ++ - 18 files changed, 7803 insertions(+), 2 deletions(-) + hw/xmir/xmir-dri2.c | 551 ++ + hw/xmir/xmir-glamor.c | 1160 + + hw/xmir/xmir-input.c| 595 +++ + hw/xmir/xmir-output.c | 428 +++ + hw/xmir/xmir-thread-proxy.c | 115 +++ + hw/xmir/xmir.c | 1719 +++ + hw/xmir/xmir.h | 230 ++ + 18 files changed, 7891 insertions(+), 2 deletions(-) create mode 100644 hw/xmir/.gitignore create mode 100644 hw/xmir/Makefile.am create mode 100644 hw/xmir/dri2/Makefile.am @@ -48,10 +48,10 @@ Contributions from: create mode 100644 hw/xmir/xmir.h diff --git a/configure.ac b/configure.ac -index 77cf234..8bf62a0 100644 +index 868e859..dac8887 100644 --- a/configure.ac +++ b/configure.ac -@@ -628,6 +628,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server +@@ -638,6 +638,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server AC_ARG_ENABLE(xnest,AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) AC_ARG_ENABLE(xquartz,AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto]) AC_ARG_ENABLE(xwayland, AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto]) @@ -59,7 +59,7 @@ index 77cf234..8bf62a0 100644 AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no]) AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto]) AC_ARG_ENABLE(glamor, AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: no)]), [GLAMOR=$enableval], [GLAMOR=no]) -@@ -746,6 +747,7 @@ case $host_os in +@@ -756,6 +757,7 @@ case $host_os in XVFB=no XNEST=no XWAYLAND=no @@ -67,7 +67,7 @@ index 77cf234..8bf62a0 100644 COMPOSITE=no DGA=no -@@ -2482,6 +248
xorg-server: Changes to 'ubuntu'
debian/changelog |7 ++
debian/patches/xmir.patch | 117 ++
2 files changed, 95 insertions(+), 29 deletions(-)
New commits:
commit 06448c36b89b794b407bfcbb895d6ce981d6690f
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Wed Jun 1 11:32:40 2016 +1200
* debian/patches/xmir.patch:
- Add focus/unfocus event passing (LP: #1582471)
diff --git a/debian/changelog b/debian/changelog
index a12f0ce..50209bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.3-1ubuntu6) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Add focus/unfocus event passing (LP: #1582471)
+
+ -- Robert Ancell <robert.anc...@canonical.com> Wed, 01 Jun 2016 11:07:46
+1200
+
xorg-server (2:1.18.3-1ubuntu5) yakkety; urgency=medium
* randr-adjust-masters-last-set-time.diff,
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 2ce304b..e7ff8d7 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From b91d0ee0a8f92865dbf0ab6b402ff15a19aa6992 Mon Sep 17 00:00:00 2001
+From eb0fb72f618ea17a90d6c535d38e12b5f95fcec8 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.anc...@canonical.com>
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -9,26 +9,27 @@ Contributions from:
Robert Ancell <robert.anc...@canonical.com>
Andreas Pokorny <andreas.poko...@canonical.com>
Daniel van Vugt <daniel.van.v...@canonical.com>
+ Chris Townsend <christopher.towns...@canonical.com>
---
configure.ac| 25 +
hw/Makefile.am |9 +-
hw/xmir/.gitignore |1 +
hw/xmir/Makefile.am | 61 ++
hw/xmir/dri2/Makefile.am| 14 +
- hw/xmir/dri2/dri2.c | 1398 ++
+ hw/xmir/dri2/dri2.c | 1398 +
hw/xmir/dri2/dri2.h | 364 ++
- hw/xmir/dri2/dri2ext.c | 683 +++
+ hw/xmir/dri2/dri2ext.c | 683 ++
hw/xmir/dri2/dri2int.h | 26 +
hw/xmir/xmir-cursor.c | 210 ++
- hw/xmir/xmir-cvt.c | 304 +
- hw/xmir/xmir-dri2.c | 545 +++
- hw/xmir/xmir-glamor.c | 1160
+ hw/xmir/xmir-cvt.c | 304
+ hw/xmir/xmir-dri2.c | 551 +++
+ hw/xmir/xmir-glamor.c | 1160 +++
hw/xmir/xmir-input.c| 592
- hw/xmir/xmir-output.c | 449 +
+ hw/xmir/xmir-output.c | 449
hw/xmir/xmir-thread-proxy.c | 109 +++
- hw/xmir/xmir.c | 1571 +++
- hw/xmir/xmir.h | 226 +++
- 18 files changed, 7745 insertions(+), 2 deletions(-)
+ hw/xmir/xmir.c | 1622 +++
+ hw/xmir/xmir.h | 227 ++
+ 18 files changed, 7803 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -3248,10 +3249,10 @@ index 000..6070d77
+}
diff --git a/hw/xmir/xmir-dri2.c b/hw/xmir/xmir-dri2.c
new file mode 100644
-index 000..b24d4b9
+index 000..e1d02f0
--- /dev/null
+++ b/hw/xmir/xmir-dri2.c
-@@ -0,0 +1,545 @@
+@@ -0,0 +1,551 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -3743,10 +3744,16 @@ index 000..b24d4b9
+
+static int xmir_dri_get_msc(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
+{
-+/* TODO: Implement this?
-+ * At least doing nothing like this is enough to shut up Chromium
-+ * error messages.
-+ */
++/* TODO: Implement this properly after Mir implements it. */
++const uint64_t now_us = GetTimeInMicros();
++const uint64_t fake_frame_rate_hz = 60;
++const uint64_t fake_frame_time_us = 100 / fake_frame_rate_hz;
++const uint64_t fake_msc = now_us / fake_frame_time_us;
++const uint64_t fake_ust = fake_msc * fake_frame_time_us;
++if (ust)
++*(uint64_t*)ust = fake_ust;
++if (msc)
++*(uint64_t*)msc = fake_msc;
+return Success;
+}
+
@@ -6133,10 +6140,10 @@ index 000..dbb187f
+}
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
new file mode 100644
-index 000..34f78c9
+index 000..ee5fff5
--- /dev/null
+++ b/hw/xmir/xmir.c
-@@ -0,0 +1,1571 @@
+@@ -0,0 +1,1622 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -6767,17 +6774,20 @@ index 000..34f78c9
+wm_type = xmir_get_window_prop_atom(window,
GET_ATOM(_NET_WM_WINDOW_TYPE));
+wm_transient_for = xmir_get_window_prop_window(window,
XA_WM_TRANSIENT_FOR);
+
-+XMIR_DEBUG(("Realize %swindow %p \"%s\": %dx%d %+d%+d parent=%p\n"
++XMIR_DEBUG(("Realize %swindow %p id=0x%x \"%s\": %dx%d %+d%+d p
xorg: Changes to 'ubuntu'
debian/changelog | 14 ++
debian/control |6 +++---
2 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 77ea62b8e64a1e0037d2a8b9ef2e3a591dfcd89b
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Mon May 30 16:37:21 2016 +1200
control: Drop freedreno and void from video/input-all so that they don't
block the transition while MIR's are being processed.
diff --git a/debian/changelog b/debian/changelog
index fb304fc..b286dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+13ubuntu3) xenial; urgency=medium
+
+ * control: Drop freedreno and void from video/input-all so that they
+don't block the transition while MIR's are being processed.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Fri, 04 Mar 2016 16:53:04 +0200
+
xorg (1:7.7+13ubuntu2) xenial; urgency=medium
* control: Demote -intel to -video-all Recommends, allowing uninstall
diff --git a/debian/control b/debian/control
index 29814a9..4bb1398 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Depends:
xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x],
xserver-xorg-video-ati [!hurd-any !s390x],
xserver-xorg-video-fbdev [!s390x],
- xserver-xorg-video-freedreno [armel armhf],
+# xserver-xorg-video-freedreno [armel armhf],
xserver-xorg-video-dummy [s390x],
xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
xserver-xorg-video-vesa [!s390x],
@@ -81,7 +81,7 @@ Depends:
xserver-xorg-input-mouse [!linux-any],
xserver-xorg-input-synaptics [!s390x],
xserver-xorg-input-vmmouse [amd64 i386 x32],
- xserver-xorg-input-void [s390x],
+# xserver-xorg-input-void [s390x],
xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x],
${misc:Depends},
Recommends:
commit 10166896cba4331891b9a40912f2abd6cb63a135
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Mon May 30 16:37:03 2016 +1200
control: Demote -intel to -video-all Recommends, allowing uninstall without
removing the metapackage.
diff --git a/debian/changelog b/debian/changelog
index 68e78bf..fb304fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+13ubuntu2) xenial; urgency=medium
+
+ * control: Demote -intel to -video-all Recommends, allowing uninstall
+without removing the metapackage.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 18 Feb 2016 07:35:17 +0200
+
xorg (1:7.7+13ubuntu1) xenial; urgency=medium
* Merge from Debian.
diff --git a/debian/control b/debian/control
index 063d043..29814a9 100644
--- a/debian/control
+++ b/debian/control
@@ -57,12 +57,12 @@ Depends:
xserver-xorg-video-fbdev [!s390x],
xserver-xorg-video-freedreno [armel armhf],
xserver-xorg-video-dummy [s390x],
- xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
xserver-xorg-video-vesa [!s390x],
xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32],
${misc:Depends},
Recommends:
+ xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
xserver-xorg-video-qxl [amd64 i386 x32],
Suggests:
xserver-xorg-video-geode [i386],
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog |9 +
debian/patches/series |1
debian/patches/xmir-fixes.diff | 149
debian/patches/xmir.patch | 216 +
4 files changed, 122 insertions(+), 253 deletions(-)
New commits:
commit 328cfba3ee6c5dbc17e68957ebb45cf0e3d82309
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Wed May 4 12:28:26 2016 +1200
* debian/patches/xmir.patch:
- Fix recently added keymap code
* debian/patches/xmir-fixes.diff:
- Merged into xmir.patch
diff --git a/debian/changelog b/debian/changelog
index 8517549..b31bc7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.18.3-1ubuntu2.2) xenial; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix recently added keymap code
+ * debian/patches/xmir-fixes.diff:
+- Merged into xmir.patch
+
+ -- Robert Ancell <robert.anc...@canonical.com> Wed, 04 May 2016 12:19:14
+1200
+
xorg-server (2:1.18.3-1ubuntu2.1) xenial; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 80c0c56..891be0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,4 +50,3 @@ xmir.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
-xmir-fixes.diff
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
deleted file mode 100644
index 1f95270..000
--- a/debian/patches/xmir-fixes.diff
+++ /dev/null
@@ -1,149 +0,0 @@
-Description: port xmir to 1.18
-
a/hw/xmir/xmir-output.c
-+++ b/hw/xmir/xmir-output.c
-@@ -327,10 +327,10 @@ xmir_output_handle_resize(struct xmir_wi
-
- if (xmir_screen->glamor) {
- glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(pixmap);
--glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
-+glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
- glClearColor(0., 0., 0., 1.);
- glClear(GL_COLOR_BUFFER_BIT);
--glamor_copy_n_to_n_nf(>root->drawable, >drawable,
-+glamor_copy(>root->drawable, >drawable,
- NULL, _box, 1, 0, 0, FALSE, FALSE, 0,
NULL);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
- } else {
a/hw/xmir/xmir.c
-+++ b/hw/xmir/xmir.c
-@@ -1246,7 +1246,7 @@ xmir_create_screen_resources(ScreenPtr s
- if (xmir_screen->glamor && !xmir_screen->rootless) {
- glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(screen->devPrivate);
-
--glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
-+glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
- glClear(GL_COLOR_BUFFER_BIT);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
-
a/hw/xmir/xmir-glamor.c
-+++ b/hw/xmir/xmir-glamor.c
-@@ -220,7 +220,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
-
- pixmap_priv_get_scale(src_pixmap_priv, _xscale, _yscale);
-
--if (src_pixmap_priv->base.gl_fbo == GLAMOR_FBO_UNATTACHED)
-+if (src_pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
- FatalError("aeiou\n");
-
- glViewport(dx, dy, width + dx, height + dy);
-@@ -231,7 +231,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
-
- if (!fbo) {
-glActiveTexture(GL_TEXTURE0);
-- glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex);
-+ glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->fbo->tex);
-
- if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
GL_CLAMP_TO_BORDER);
-@@ -272,13 +272,8 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
- _tx1 = v_from_x_coord_x(dst_xscale, dbox.x1);
- _tx2 = v_from_x_coord_x(dst_xscale, dbox.x2);
-
--if (xmir_screen->gbm) {
--_ty1 = v_from_x_coord_y_inverted(dst_yscale, dbox.y1);
--_ty2 = v_from_x_coord_y_inverted(dst_yscale, dbox.y2);
--} else {
--_ty1 = v_from_x_coord_y(dst_yscale, dbox.y1);
--_ty2 = v_from_x_coord_y(dst_yscale, dbox.y2);
--}
-+_ty1 = v_from_x_coord_y(dst_yscale, dbox.y1);
-+_ty2 = v_from_x_coord_y(dst_yscale, dbox.y2);
-
- /* upper left */
- vertices[0] = _tx1;
-@@ -317,13 +312,8 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
- _tx1 = v_from_x_coord_x(dst_xscale, dbox.x1);
- _tx2 = v_from_x_coord_x(dst_xscale, dbox.x2);
-
--if (xmir_screen->gbm) {
--_ty1 = v_from_x_coord_y_inverted(dst_yscale, dbox.y1);
--_ty2 = v_from_x_coord_y_inverted(dst_yscale, dbox.y2);
--} else {
--_ty1 = v_from_x_coord_y(dst_yscale, dbox.y1);
--_ty2 = v_from_x_coord_y(dst_yscale, dbox.y2);
--}
-+_ty1 = v_from_x_coord_y(dst_yscale, dbox.y1);
-+_ty2 = v_from
xorg-server: Changes to 'ubuntu'
debian/changelog |7 +++
debian/patches/xmir.patch | 27 ---
2 files changed, 23 insertions(+), 11 deletions(-)
New commits:
commit d844958990525442322f83937f2fca2701b922c8
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Wed May 4 12:04:26 2016 +1200
* debian/patches/xmir.patch:
- Fix recently added keymap code
diff --git a/debian/changelog b/debian/changelog
index a6337c6..6c47fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.3-1ubuntu4) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix recently added keymap code
+
+ -- Robert Ancell <robert.anc...@canonical.com> Wed, 04 May 2016 09:11:32
+1200
+
xorg-server (2:1.18.3-1ubuntu3) yakkety; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 4e772a9..2ce304b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From b97cd5fc8d76dcb45fac1965c8251e7d31e641b3 Mon Sep 17 00:00:00 2001
+From b91d0ee0a8f92865dbf0ab6b402ff15a19aa6992 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.anc...@canonical.com>
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -23,12 +23,12 @@ Contributions from:
hw/xmir/xmir-cvt.c | 304 +
hw/xmir/xmir-dri2.c | 545 +++
hw/xmir/xmir-glamor.c | 1160
- hw/xmir/xmir-input.c| 594
+ hw/xmir/xmir-input.c| 592
hw/xmir/xmir-output.c | 449 +
hw/xmir/xmir-thread-proxy.c | 109 +++
- hw/xmir/xmir.c | 1564 +++
+ hw/xmir/xmir.c | 1571 +++
hw/xmir/xmir.h | 226 +++
- 18 files changed, 7740 insertions(+), 2 deletions(-)
+ 18 files changed, 7745 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -94,7 +94,7 @@ index 77cf234..8bf62a0 100644
dnl and the rest of these are generic, so they're in config.h
dnl
-@@ -2622,6 +2645,8 @@ hw/kdrive/fbdev/Makefile
+@@ -2630,6 +2653,8 @@ hw/kdrive/fbdev/Makefile
hw/kdrive/linux/Makefile
hw/kdrive/src/Makefile
hw/xwayland/Makefile
@@ -4965,10 +4965,10 @@ index 000..7ad0245
+}
diff --git a/hw/xmir/xmir-input.c b/hw/xmir/xmir-input.c
new file mode 100644
-index 000..e5fd2d5
+index 000..14c4709
--- /dev/null
+++ b/hw/xmir/xmir-input.c
-@@ -0,0 +1,594 @@
+@@ -0,0 +1,592 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -5447,8 +5447,6 @@ index 000..e5fd2d5
+
+mir_keymap_event_get_keymap_buffer(ev, (char const **), );
+
-+buffer[length] = '\0';
-+
+xkb = XkbCompileKeymapFromString(xmir_input->keyboard, buffer, length);
+
+XkbUpdateDescActions(xkb, xkb->min_key_code, XkbNumKeys(xkb), );
@@ -6135,10 +6133,10 @@ index 000..dbb187f
+}
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
new file mode 100644
-index 000..5526958
+index 000..34f78c9
--- /dev/null
+++ b/hw/xmir/xmir.c
-@@ -0,0 +1,1564 @@
+@@ -0,0 +1,1571 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -7541,6 +7539,13 @@ index 000..5526958
+
+mir_connection_get_available_surface_formats(xmir_screen->conn,
+format, sizeof(format)/sizeof(format[0]), );
++
++#if 0 /* Emulate the Mir Android graphics platform for LP: #1573470 */
++format[0] = mir_pixel_format_abgr_;
++format[1] = mir_pixel_format_xbgr_;
++formats = 2;
++#endif
++
+for (f = 0; f < formats; ++f) {
+switch (format[f]) {
+case mir_pixel_format_argb_:
xorg-server: Changes to 'ubuntu-xenial'
New branch 'ubuntu-xenial' available with the following commits: commit 242ec8b9121e7a4fbbed596c38b4d4f7612f202e Author: Robert Ancell <robert.anc...@canonical.com> Date: Fri Apr 29 16:07:25 2016 +0200 release to xenial
xorg-server: Changes to 'ubuntu'
debian/changelog |9 +
debian/patches/series|1
debian/patches/xmir-desktop-file-hint-flag.patch | 15 +-
debian/patches/xmir-fixes.diff | 149 ---
debian/patches/xmir.patch| 111 +
5 files changed, 82 insertions(+), 203 deletions(-)
New commits:
commit 49995bc9b0af37782d06b55731eab54621008b97
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Fri Apr 29 15:03:30 2016 +0200
Update xmir.patch
diff --git a/debian/changelog b/debian/changelog
index dc35c4f..a6337c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.18.3-1ubuntu3) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Pass keymap from Mir to Xkb (LP: #1566487)
+ * debian/patches/xmir-fixes.diff:
+- Merged into xmir.patch
+
+ -- Robert Ancell <robert.anc...@canonical.com> Fri, 29 Apr 2016 14:36:49
+0200
+
xorg-server (2:1.18.3-1ubuntu2) xenial; urgency=medium
* Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now,
diff --git a/debian/patches/series b/debian/patches/series
index 80c0c56..891be0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,4 +50,3 @@ xmir.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
-xmir-fixes.diff
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
index 16e3152..f015ca3 100644
--- a/debian/patches/xmir-desktop-file-hint-flag.patch
+++ b/debian/patches/xmir-desktop-file-hint-flag.patch
@@ -1,16 +1,18 @@
-From 938313b76b0e3279a94af931cbe5fd34b8cb580c Mon Sep 17 00:00:00 2001
+From de9e6e1d66680e717471df2c4032e590fd1b9ae0 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.anc...@canonical.com>
-Date: Mon, 13 Jul 2015 15:54:32 +1200
-Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag required by Unity8
- to decide which application is starting
+Date: Fri, 29 Apr 2016 14:58:28 +0200
+Subject: [PATCH xserver 2/3] xmir: Ignore --desktop_file_hint flag required by
+ Unity8 to decide which application is starting
---
hw/xmir/xmir.c | 3 +++
1 file changed, 3 insertions(+)
+diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
+index 5526958..ea85f1a 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
-@@ -168,6 +168,9 @@ ddxProcessArgument(int argc, char *argv[
+@@ -172,6 +172,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
} else if (!strcmp(argv[i], "-novtswitch") ||
!strncmp(argv[i], "vt", 2)) {
return 1;
@@ -20,3 +22,6 @@ Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag
required by Unity8
} else if (!strcmp(argv[i], "-fd")) {
if (!seen_shared)
NoListenAll = 1;
+--
+2.7.4
+
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
deleted file mode 100644
index 1f95270..000
--- a/debian/patches/xmir-fixes.diff
+++ /dev/null
@@ -1,149 +0,0 @@
-Description: port xmir to 1.18
-
a/hw/xmir/xmir-output.c
-+++ b/hw/xmir/xmir-output.c
-@@ -327,10 +327,10 @@ xmir_output_handle_resize(struct xmir_wi
-
- if (xmir_screen->glamor) {
- glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(pixmap);
--glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
-+glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
- glClearColor(0., 0., 0., 1.);
- glClear(GL_COLOR_BUFFER_BIT);
--glamor_copy_n_to_n_nf(>root->drawable, >drawable,
-+glamor_copy(>root->drawable, >drawable,
- NULL, _box, 1, 0, 0, FALSE, FALSE, 0,
NULL);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
- } else {
a/hw/xmir/xmir.c
-+++ b/hw/xmir/xmir.c
-@@ -1246,7 +1246,7 @@ xmir_create_screen_resources(ScreenPtr s
- if (xmir_screen->glamor && !xmir_screen->rootless) {
- glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(screen->devPrivate);
-
--glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
-+glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
- glClear(GL_COLOR_BUFFER_BIT);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
-
a/hw/xmir/xmir-glamor.c
-+++ b/hw/xmir/xmir-glamor.c
-@@ -220,7 +220,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
-
- pixmap_priv_get_scale(src_pixmap_priv, _xscale, _yscale);
-
--if (src_pixmap_priv->base.gl_fbo == GLAMOR_FBO_UNATTACHED)
-+if (src_pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
- FatalError("aeiou\n");
-
- glViewport(dx, dy, width + dx, height + dy);
-@@ -231,7 +231,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
-
- if (!fbo) {
-glActiveTexture(GL_TEXTURE0);
-- glBindTexture(GL_TEXTURE_2D, src_pixmap_p
xorg-server: Changes to 'ubuntu'
debian/changelog |7 +++ debian/patches/xmir.patch | 22 ++ 2 files changed, 13 insertions(+), 16 deletions(-) New commits: commit b8fa2c2ad4c2e8f27366f5f17eb6cc123ef61caf Author: Robert Ancell <robert.anc...@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.anc...@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.anc...@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 000..dbb187f +} diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c new file mode 100644 -index 000..12abaef +index 000..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 000..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)
xorg-server: Changes to 'ubuntu'
debian/changelog |8 +++- debian/control |2 +- debian/rules |2 +- 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 01ff19d871603204c9bbf6a920a78a2fefa722f5 Author: Robert Ancell <robert.anc...@canonical.com> Date: Mon Feb 15 18:08:57 2016 -0800 Add in missing released commit diff --git a/debian/changelog b/debian/changelog index 6152b8e..e7fc71b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium +xorg-server (2:1.17.3-2ubuntu3) xenial; urgency=medium * debian/patches/xmir.patch: - Add ability to set title for XMir (LP: #1542028) @@ -7,6 +7,12 @@ xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium -- Robert Ancell <robert.anc...@canonical.com> Mon, 15 Feb 2016 17:32:21 -0800 +xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium + + * Disable mir on s390x. + + -- Dimitri John Ledkov <x...@ubuntu.com> Wed, 25 Nov 2015 16:11:38 + + xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium [ Robert Ancell ] diff --git a/debian/control b/debian/control index 6d63639..ddbe447 100644 --- a/debian/control +++ b/debian/control @@ -101,7 +101,7 @@ Build-Depends: #logind libdbus-1-dev (>= 1.0) [linux-any], # XMir - libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el], + libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el !s390x], mir-client-platform-mesa-dev, Standards-Version: 3.9.6 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git diff --git a/debian/rules b/debian/rules index 5d1f9a7..040282e 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,7 @@ else endif # Mir isn't built on PPC -ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el)) +ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x)) build_xmir = --disable-xmir endif
xorg-server: Changes to 'ubuntu'
debian/changelog |9 +++
debian/patches/xmir.patch | 137 +-
2 files changed, 97 insertions(+), 49 deletions(-)
New commits:
commit d7d8c7fa904add6792729e1bd517e0861c5967ca
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Mon Feb 15 17:47:03 2016 -0800
* debian/patches/xmir.patch:
- Add ability to set title for XMir (LP: #1542028)
- Use swapinterval 0 (LP: #1502738)
- Add sufficient traversal hacks for Matchbox
diff --git a/debian/changelog b/debian/changelog
index 006962c..6152b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Add ability to set title for XMir (LP: #1542028)
+- Use swapinterval 0 (LP: #1502738)
+- Add sufficient traversal hacks for Matchbox
+
+ -- Robert Ancell <robert.anc...@canonical.com> Mon, 15 Feb 2016 17:32:21
-0800
+
xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium
[ Robert Ancell ]
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 79b7d1c..aa7d1a7 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From debdda3bfd737885c4fbbbcff06518c507009077 Mon Sep 17 00:00:00 2001
+From 47d65374fdc820777aaf84018574b8ce0d303dac Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.anc...@canonical.com>
Date: Fri, 15 May 2015 14:58:59 +1200
Subject: [PATCH 1/3] XMir DDX
@@ -15,20 +15,20 @@ Contributions from:
hw/xmir/.gitignore |1 +
hw/xmir/Makefile.am | 61 ++
hw/xmir/dri2/Makefile.am| 14 +
- hw/xmir/dri2/dri2.c | 1398 +++
- hw/xmir/dri2/dri2.h | 364 +++
+ hw/xmir/dri2/dri2.c | 1398 ++
+ hw/xmir/dri2/dri2.h | 364 ++
hw/xmir/dri2/dri2ext.c | 683 +++
hw/xmir/dri2/dri2int.h | 26 +
hw/xmir/xmir-cursor.c | 210 ++
hw/xmir/xmir-cvt.c | 304 +
- hw/xmir/xmir-dri2.c | 545
- hw/xmir/xmir-glamor.c | 1173 +
- hw/xmir/xmir-input.c| 577
- hw/xmir/xmir-output.c | 456 +
- hw/xmir/xmir-thread-proxy.c | 109
- hw/xmir/xmir.c | 1518 +++
- hw/xmir/xmir.h | 225 +++
- 18 files changed, 7696 insertions(+), 2 deletions(-)
+ 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-thread-proxy.c | 109 +++
+ hw/xmir/xmir.c | 1574 +++
+ hw/xmir/xmir.h | 226 +++
+ 18 files changed, 7735 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -4978,10 +4978,10 @@ index 000..2438013
+}
diff --git a/hw/xmir/xmir-input.c b/hw/xmir/xmir-input.c
new file mode 100644
-index 000..2c3bb77
+index 000..727fc56
--- /dev/null
+++ b/hw/xmir/xmir-input.c
-@@ -0,0 +1,577 @@
+@@ -0,0 +1,566 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -5489,17 +5489,6 @@ index 000..2c3bb77
+xmir_close_surface(xmir_window);
+break;
+case mir_event_type_surface_output:
-+{
-+ScreenPtr screen = xmir_screen->screen;
-+MirSurfaceOutputEvent const* soe =
-+mir_event_get_surface_output_event(ev);
-+int dpi = mir_surface_output_event_get_dpi(soe);
-+xmir_screen->dpi = dpi;
-+screen->mmWidth = screen->width * 254 / (10 * dpi);
-+screen->mmHeight = screen->height * 254 / (10 * dpi);
-+XMIR_DEBUG(("Now screen is %hdx%hd mm\n",
-+screen->mmWidth, screen->mmHeight));
-+}
+break;
+default:
+ErrorF("Received an unknown %u event\n", mir_event_get_type(ev));
@@ -5561,10 +5550,10 @@ index 000..2c3bb77
+}
diff --git a/hw/xmir/xmir-output.c b/hw/xmir/xmir-output.c
new file mode 100644
-index 000..5a54cf2
+index 000..bde0940
--- /dev/null
+++ b/hw/xmir/xmir-output.c
-@@ -0,0 +1,456 @@
+@@ -0,0 +1,449 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -6001,13 +5990,6 @@ index 000..5a54cf2
+
+snprintf(name, sizeof name, "%s-%d", output_type_str, type_count);
+xmir_output_create(xmir_screen, mir_output, name);
-+
-+if (mir_output->connected) {
-+MirDisplayMode *mode =
_output->modes[mir_output->current_mode];
-+xmir_screen->dpi = mode->horizontal_resolution *
xorg-server: Changes to 'ubuntu'
debian/changelog |9
debian/patches/series |1
debian/patches/xmir-rootless.patch | 296 ---
debian/patches/xmir.patch | 1549 ++---
4 files changed, 1109 insertions(+), 746 deletions(-)
New commits:
commit d607125530d7e0589f16dd7e4db57838fdc1352f
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Tue Nov 3 10:24:20 2015 +1300
* debian/patches/xmir.patch:
- Update to latest version
* debian/patches/xmir-rootless.patch:
- Merged into xmir.patch
diff --git a/debian/changelog b/debian/changelog
index 7ea1038..a1f463a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Update to latest version
+ * debian/patches/xmir-rootless.patch:
+- Merged into xmir.patch
+
+ -- Robert Ancell <robert.anc...@canonical.com> Tue, 03 Nov 2015 10:23:16
+1300
+
xorg-server (2:1.17.3-2) unstable; urgency=medium
* Finalize xserver-xorg-core.NEWS. Thanks, Michael Biebl!
diff --git a/debian/patches/series b/debian/patches/series
index 6945191..75b075f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,7 +48,6 @@ disable-rotation-transform-gpuscreens.patch
fix-ftbfs-ppc64el.patch
xmir.patch
-xmir-rootless.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
deleted file mode 100644
index f3bef1e..000
--- a/debian/patches/xmir-rootless.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From a7b78b9c0eee1a53e0fed309474aa6cc76656ffc Mon Sep 17 00:00:00 2001
-From: Robert Ancell <robert.anc...@canonical.com>
-Date: Thu, 9 Jul 2015 14:03:49 +1200
-Subject: [PATCH 2/4] xmir: Support rootless
-
-Contributions from:
- Maarten Lankhorst <maarten.lankho...@ubuntu.com>
- Robert Ancell <robert.anc...@canonical.com>
- composite/compalloc.c| 6 ++
- composite/compositeext.h | 3 +++
- hw/xmir/xmir-cursor.c| 5 -
- hw/xmir/xmir-dri2.c | 4
- hw/xmir/xmir-input.c | 34 ++
- hw/xmir/xmir-output.c| 8
- hw/xmir/xmir.c | 48 +++-
- hw/xmir/xmir.h | 2 +-
- 8 files changed, 99 insertions(+), 11 deletions(-)
-
-diff --git a/composite/compalloc.c b/composite/compalloc.c
-index 8daded0..fb1b476 100644
a/composite/compalloc.c
-+++ b/composite/compalloc.c
-@@ -46,6 +46,7 @@
- #endif
-
- #include "compint.h"
-+#include "compositeext.h"
-
- static void
- compScreenUpdate(ScreenPtr pScreen)
-@@ -411,6 +412,11 @@ compRedirectSubwindows(ClientPtr pClient, WindowPtr pWin,
int update)
- return Success;
- }
-
-+int CompositeRedirectSubwindows (WindowPtr pWin, int update)
-+{
-+return compRedirectSubwindows (serverClient, pWin, update);
-+}
-+
- /*
- * Free one of the per-client per-subwindows resources,
- * which frees one redirect per subwindow
-diff --git a/composite/compositeext.h b/composite/compositeext.h
-index b96cb1d..f279013 100644
a/composite/compositeext.h
-+++ b/composite/compositeext.h
-@@ -35,6 +35,9 @@ extern _X_EXPORT Bool
CompositeRegisterAlternateVisuals(ScreenPtr pScreen,
- VisualID * vids,
- int nVisuals);
-
-+extern _X_EXPORT int CompositeRedirectSubwindows(WindowPtr pWin,
-+ int update);
-+
- extern _X_EXPORT Bool CompositeRegisterImplicitRedirectionException(ScreenPtr
pScreen,
- VisualID
parentVisual,
- VisualID
winVisual);
-diff --git a/hw/xmir/xmir-cursor.c b/hw/xmir/xmir-cursor.c
-index 459f9ac..c311d88 100644
a/hw/xmir/xmir-cursor.c
-+++ b/hw/xmir/xmir-cursor.c
-@@ -134,7 +134,10 @@ xmir_input_set_cursor(struct xmir_input *xmir_input)
- config = mir_cursor_configuration_from_buffer_stream(stream,
cursor->bits->xhot, cursor->bits->yhot);
-
- apply:
--
mir_wait_for(mir_surface_configure_cursor(xmir_window_get(xmir_input->xmir_screen->screen->root)->surface,
config));
-+if (!xmir_input->xmir_screen->rootless)
-+
mir_wait_for(mir_surface_configure_cursor(xmir_window_get(xmir_input->xmir_screen->screen->root)->surface,
config));
-+else if (xmir_input->focus_window)
-+
mir_wait_for(mir_surface_configure_cursor(xmir_input->focus_window->surface,
config));
- mir_cursor_configuration_destroy(config);
-
- if (stream)
-diff --git a/hw/xmir/xmir-dri2.c b/hw/xmir/xmir-dri2.c
-index 1f7c1b0..4f95006 100644
a/hw/xmir/xmir-dri2.c
-+++ b/hw/xmir/xmi
xorg-server: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 426edc3ad9dd901888fe47f4c0c9fb2fcf3dd8ab Author: Robert Ancell <robert.anc...@canonical.com> Date: Tue Nov 3 11:10:45 2015 +1300 Mark as unreleased diff --git a/debian/changelog b/debian/changelog index a1f463a..f3db260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium +xorg-server (2:1.17.3-2ubuntu1) UNRELEASED; urgency=medium * debian/patches/xmir.patch: - Update to latest version
xorg-server: Changes to 'ubuntu'
debian/changelog | 21 ++
debian/control |1
debian/patches/glamor-make-current-in-prepare-paths.diff | 32 +++
debian/patches/series|1
debian/patches/xmir.patch| 141 ++-
5 files changed, 116 insertions(+), 80 deletions(-)
New commits:
commit 20ab8d0971b20d8b79da97cffbb41c99e851e899
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Tue Oct 27 11:23:29 2015 +1300
* debian/patches/xmir.patch:
- Fix FTBFS due to change in Mir headers
diff --git a/debian/changelog b/debian/changelog
index 0074e9a..9f04da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu9) wily; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix FTBFS due to change in Mir headers
+
+ -- Robert Ancell <robert.anc...@canonical.com> Wed, 30 Sep 2015 16:15:39
+1300
+
xorg-server (2:1.17.2-1ubuntu8) wily; urgency=medium
* debian/control:
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index f0c8bef..fd421ae 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -45,11 +45,11 @@ Contributions from:
create mode 100644 hw/xmir/xmir.c
create mode 100644 hw/xmir/xmir.h
-diff --git a/configure.ac b/configure.ac
-index d8f0e74..75d74ae 100644
a/configure.ac
-+++ b/configure.ac
-@@ -624,6 +624,7 @@ AC_ARG_ENABLE(xvfb,
AS_HELP_STRING([--enable-xvfb], [Build Xvfb server
+Index: xorg-server-1.17.2/configure.ac
+===
+--- xorg-server-1.17.2.orig/configure.ac
xorg-server-1.17.2/configure.ac
+@@ -629,6 +629,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_ST
AC_ARG_ENABLE(xnest,AS_HELP_STRING([--enable-xnest], [Build
Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
AC_ARG_ENABLE(xquartz,AS_HELP_STRING([--enable-xquartz], [Build
Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
AC_ARG_ENABLE(xwayland, AS_HELP_STRING([--enable-xwayland], [Build
Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto])
@@ -57,7 +57,7 @@ index d8f0e74..75d74ae 100644
AC_ARG_ENABLE(standalone-xpbproxy,
AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in
addition to the one integrated into Xquartz as a separate thread) (default:
no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build
XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
AC_ARG_ENABLE(glamor, AS_HELP_STRING([--enable-glamor], [Build glamor
dix module (default: no)]), [GLAMOR=$enableval], [GLAMOR=no])
-@@ -745,6 +746,7 @@ case $host_os in
+@@ -750,6 +751,7 @@ case $host_os in
XVFB=no
XNEST=no
XWAYLAND=no
@@ -65,13 +65,13 @@ index d8f0e74..75d74ae 100644
COMPOSITE=no
DGA=no
-@@ -2474,6 +2476,27 @@ if test "x$XWAYLAND" = xyes; then
+@@ -2495,6 +2497,27 @@ if test "x$XWAYLAND" = xyes; then
[${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
fi
+dnl Xmir DDX
+
-+PKG_CHECK_MODULES(XMIRMODULES, [mirclient >= 0.13.1 libdrm epoxy],
[have_xmir=yes], [have_xmir=no])
++PKG_CHECK_MODULES(XMIRMODULES, [mirclient >= 0.13.1
mir-client-platform-mesa-dev libdrm epoxy], [have_xmir=yes], [have_xmir=no])
+AC_MSG_CHECKING([whether to build Xmir DDX])
+if test "x$XMIR" = xauto; then
+ XMIR="$have_xmir"
@@ -93,7 +93,7 @@ index d8f0e74..75d74ae 100644
dnl and the rest of these are generic, so they're in config.h
dnl
-@@ -2622,6 +2645,8 @@ hw/kdrive/fbdev/Makefile
+@@ -2643,6 +2666,8 @@ hw/kdrive/fbdev/Makefile
hw/kdrive/linux/Makefile
hw/kdrive/src/Makefile
hw/xwayland/Makefile
@@ -102,10 +102,10 @@ index d8f0e74..75d74ae 100644
test/Makefile
test/xi1/Makefile
test/xi2/Makefile
-diff --git a/hw/Makefile.am b/hw/Makefile.am
-index 19895dc..b7b958c 100644
a/hw/Makefile.am
-+++ b/hw/Makefile.am
+Index: xorg-server-1.17.2/hw/Makefile.am
+===
+--- xorg-server-1.17.2.orig/hw/Makefile.am
xorg-server-1.17.2/hw/Makefile.am
@@ -30,6 +30,10 @@ if XWAYLAND
XWAYLAND_SUBDIRS = xwayland
endif
@@ -130,18 +130,16 @@ index 19895dc..b7b958c 100644
relink:
$(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ;
done
-diff --git a/hw/xmir/.gitignore b/hw/xmir/.gitignore
-new file mode 100644
-index 000..b6a16d4
+Index: xorg-server-1.17.2/hw/xmir/.gitignore
+===
--- /dev/null
-+++ b/hw/xmir/.gitignore
xorg-server-1.17.2/hw/x
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |8
debian/patches/randr.patch | 296 +++
debian/patches/revert-dpms-fix.patch |2
debian/patches/series|1
4 files changed, 306 insertions(+), 1 deletion(-)
New commits:
commit a18a59406278b8448717c8a708170b1fc5131f75
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Wed Oct 14 15:06:48 2015 +0100
* debian/patches/randr.patch:
- Combine upstream RandR changes to fix hotplug events not working
(LP: #1505695)
diff --git a/debian/changelog b/debian/changelog
index 004324a..75dd66c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu4) wily; urgency=medium
+
+ * debian/patches/randr.patch:
+- Combine upstream RandR changes to fix hotplug events not working
+ (LP: #1505695)
+
+ -- Robert Ancell <robert.anc...@canonical.com> Wed, 14 Oct 2015 14:59:19
+0100
+
xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu3) wily; urgency=medium
* debian/patches/revert-dpms-fix.patch:
diff --git a/debian/patches/randr.patch b/debian/patches/randr.patch
new file mode 100644
index 000..9e963b8
--- /dev/null
+++ b/debian/patches/randr.patch
@@ -0,0 +1,296 @@
+commit bf63eba5f1900ab5314e3d37dff55cfca800d400
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Sep 9 11:18:15 2015 +0100
+
+Combined RandR changes:
+f5aabb7bddc6fc5dc910a983d1291c9864f65f06
+f384af433cbb39ad74e02b10d3700e71c8668506
+d50d336605e9be7280529b0eb565402d7646c913
+2c08d72393e4c8ddf5926571b087459aaa225cb1
+650da13c7257019728cfca361dfcbe34a6c526ef
+717b6208d0d7bdcdacaf30b871216e6084c7205c
+23986f0a31dbdec2e2086ca898bee43842ab73d4
+15215651a992b7aa06314b9118ad9028b51c7e3e
+31d42ed5637a1b2223d48d0db4d7c512b27aee07
+679ee12079a7d2682d41506b81973c7c7d4fa1d8
+096ddef22d6c57198a424eef00845dc7302b0cfe
+
+diff --git a/src/sna/sna.h b/src/sna/sna.h
+index 6c4d179..7592f7b 100644
+--- a/src/sna/sna.h
b/src/sna/sna.h
+@@ -442,7 +442,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna);
+ bool sna_mode_fake_init(struct sna *sna, int num_fake);
+ bool sna_mode_wants_tear_free(struct sna *sna);
+ void sna_mode_adjust_frame(struct sna *sna, int x, int y);
+-extern void sna_mode_discover(struct sna *sna);
++extern void sna_mode_discover(struct sna *sna, bool tell);
+ extern void sna_mode_check(struct sna *sna);
+ extern bool sna_mode_disable(struct sna *sna);
+ extern void sna_mode_enable(struct sna *sna);
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 34d19bb..f562660 100644
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -90,6 +90,8 @@ void *alloca(size_t);
+ #include
+ #endif
+
++#define COLDPLUG_DELAY_MS 2000
++
+ /* Minor discrepancy between 32-bit/64-bit ABI in old kernels */
+ union compat_mode_get_connector{
+ struct drm_mode_get_connector conn;
+@@ -951,6 +953,8 @@ static void
+ sna_crtc_force_outputs_on(xf86CrtcPtr crtc)
+ {
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
++ /* All attached outputs are valid, so update our timestamps */
++ unsigned now = GetTimeInMillis();
+ int i;
+
+ assert(to_sna_crtc(crtc));
+@@ -970,6 +974,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr crtc)
+ continue;
+
+ __sna_output_dpms(output, DPMSModeOn, false);
++ to_sna_output(output)->last_detect = now;
+ }
+
+ #if XF86_CRTC_VERSION >= 3
+@@ -1211,9 +1216,10 @@ sna_crtc_apply(xf86CrtcPtr crtc)
+output_count, output_count ? output_ids[0] : 0));
+
+ ret = drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, ) == 0;
+-
+- sna_crtc->mode_serial++;
+- sna_crtc_force_outputs_on(crtc);
++ if (ret) {
++ sna_crtc->mode_serial++;
++ sna_crtc_force_outputs_on(crtc);
++ }
+ unblock:
+ sigio_unblock(sigio);
+ return ret;
+@@ -2633,7 +2639,7 @@ error:
+ sna_crtc->cursor_transform = saved_cursor_transform;
+ sna_crtc->hwcursor = saved_hwcursor;
+ sna_crtc->bo = saved_bo;
+- sna_mode_discover(sna);
++ sna_mode_discover(sna, true);
+ return FALSE;
+ }
+
+@@ -4787,17 +4793,53 @@ static bool disable_unused_crtc(struct sna *sna)
+ return update;
+ }
+
+-void sna_mode_discover(struct sna *sna)
++static bool
++output_check_status(struct sna *sna, struct sna_output *output)
++{
++ union compat_mode_get_connector compat_conn;
++ struct drm_mode_modeinfo dummy;
++ xf86OutputStatus status;
++
++ VG_CLEAR(compat_conn);
++
++ compat_conn.conn.connector_id = output->id;
++ compat_conn.conn.count_modes = 1; /* skip detect */
++ compat_conn.conn.modes_ptr = (uintptr_t)
++ compat_conn.conn.count_encoders = 0;
++ compat_conn.conn.count_p
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |7 +++ debian/control |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 13b7426fde0f4e363670f7c2263dc722ce939c51 Author: Robert Ancell <robert.anc...@canonical.com> Date: Tue Oct 6 14:23:33 2015 +1300 Rebuild for libxcb-util. diff --git a/debian/changelog b/debian/changelog index 921859e..516562e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu2) wily; urgency=medium + + * Rebuild for libxcb-util. + * libxcb-util0-dev -> libxcb-util-dev. + + -- Matthias Klose <d...@ubuntu.com> Tue, 01 Sep 2015 13:12:05 +0200 + xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) wily; urgency=medium [ Robert Hooker ] diff --git a/debian/control b/debian/control index c2c4998..9f447df 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Build-Depends: libxext-dev, libxfixes-dev, libx11-xcb-dev, - libxcb-util0-dev, + libxcb-util-dev, libxcb-dri2-0-dev, # end xvmc libudev-dev [linux-any],
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |8 ++
debian/patches/revert-dpms-fix.patch | 128 +++
debian/patches/series|1
3 files changed, 137 insertions(+)
New commits:
commit 08bc4d781bbc696e0477a8e3500bd77dea05
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Tue Oct 6 14:25:21 2015 +1300
* debian/patches/revert-dpms-fix.patch:
- Revert a DPMS change that causes the screen to turn off when returning
from a greeter (LP: #1501941)
diff --git a/debian/changelog b/debian/changelog
index 516562e..0572eca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu2+dpmsfix) wily;
urgency=medium
+
+ * debian/patches/revert-dpms-fix.patch:
+- Revert a DPMS change that causes the screen to turn off when returning
+ from a greeter (LP: #1501941)
+
+ -- Robert Ancell <robert.anc...@canonical.com> Tue, 06 Oct 2015 14:25:00
+1300
+
xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu2) wily; urgency=medium
* Rebuild for libxcb-util.
diff --git a/debian/patches/revert-dpms-fix.patch
b/debian/patches/revert-dpms-fix.patch
new file mode 100644
index 000..b08933b
--- /dev/null
+++ b/debian/patches/revert-dpms-fix.patch
@@ -0,0 +1,128 @@
+From 9a8b44dd6fc63f2562a17395c54f5f439cad9008 Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.anc...@canonical.com>
+Date: Fri, 2 Oct 2015 14:22:42 +1300
+Subject: [PATCH xf86-video-intel 2/2] Revert "sna: Be robust in handling DPMS
+ failures"
+
+This reverts commit 7d9a74622e5a936e4860fcef8358619bf59adae8.
+---
+ src/sna/sna_display.c | 41 ++---
+ 1 file changed, 14 insertions(+), 27 deletions(-)
+
+Index: xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
+===
+--- xserver-xorg-video-intel-2.99.917+git20150808.orig/src/sna/sna_display.c
xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
+@@ -222,7 +222,7 @@ struct sna_output {
+ int panel_vdisplay;
+
+ uint32_t dpms_id;
+- uint8_t dpms_mode;
++ int dpms_mode;
+ struct backlight backlight;
+ int backlight_active_level;
+
+@@ -260,7 +260,6 @@ enum { /* XXX copied from hw/xfree86/mod
+ OPTION_DEFAULT_MODES,
+ };
+
+-static void __sna_output_dpms(xf86OutputPtr output, int dpms, int fixup);
+ static void sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc);
+
+ static bool is_zaphod(ScrnInfoPtr scrn)
+@@ -969,7 +968,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr cr
+ if (output->crtc != crtc)
+ continue;
+
+- __sna_output_dpms(output, DPMSModeOn, false);
++ output->funcs->dpms(output, DPMSModeOn);
+ }
+
+ #if XF86_CRTC_VERSION >= 3
+@@ -999,7 +998,7 @@ sna_crtc_force_outputs_off(xf86CrtcPtr c
+ if (output->crtc != crtc)
+ continue;
+
+- __sna_output_dpms(output, DPMSModeOff, false);
++ output->funcs->dpms(output, DPMSModeOff);
+ }
+ }
+
+@@ -1135,7 +1134,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
+* and we lose track of the user settings.
+*/
+ if (output->crtc == NULL)
+- __sna_output_dpms(output, DPMSModeOff, false);
++ output->funcs->dpms(output, DPMSModeOff);
+
+ if (output->crtc != crtc)
+ continue;
+@@ -3650,7 +3649,7 @@ sna_output_destroy(xf86OutputPtr output)
+ }
+
+ static void
+-__sna_output_dpms(xf86OutputPtr output, int dpms, int fixup)
++sna_output_dpms(xf86OutputPtr output, int dpms)
+ {
+ struct sna *sna = to_sna(output->scrn);
+ struct sna_output *sna_output = output->driver_private;
+@@ -3677,9 +3676,8 @@ __sna_output_dpms(xf86OutputPtr output,
+ if (sna_output->backlight.iface && dpms != DPMSModeOn) {
+ if (old_dpms == DPMSModeOn) {
+ sna_output->backlight_active_level =
sna_output_backlight_get(output);
+- DBG(("%s(%s:%d): saving current backlight %d\n",
+- __FUNCTION__, output->name, sna_output->id,
+- sna_output->backlight_active_level));
++ DBG(("%s: saving current backlight %d\n",
++ __FUNCTION__, sna_output->backlight_active_level));
+ }
+ sna_output->dpms_mode = dpms;
+ sna_output_backlight_off(sna_output);
+@@ -3689,31 +3687,18 @@ __sna_output_dpms(xf86OutputPtr output,
+ drmModeConnectorSetProperty(sna->kgem.fd,
+ sna_output->id,
+ sna_output->dpms
xserver-xorg-video-intel: Changes to 'ubuntu'
Rebased ref, commits from common ancestor:
commit 187dc4ac97cdf70dbf5e9050c871e149f673a4e0
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Tue Oct 6 14:25:21 2015 +1300
* debian/patches/revert-dpms-fix.patch:
- Revert a DPMS change that causes the screen to turn off when returning
from a greeter (LP: #1501941)
diff --git a/debian/changelog b/debian/changelog
index 516562e..004324a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu3) wily; urgency=medium
+
+ * debian/patches/revert-dpms-fix.patch:
+- Revert a DPMS change that causes the screen to turn off when returning
+ from a greeter (LP: #1501941)
+
+ -- Robert Ancell <robert.anc...@canonical.com> Tue, 06 Oct 2015 14:25:00
+1300
+
xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu2) wily; urgency=medium
* Rebuild for libxcb-util.
diff --git a/debian/patches/revert-dpms-fix.patch
b/debian/patches/revert-dpms-fix.patch
new file mode 100644
index 000..b08933b
--- /dev/null
+++ b/debian/patches/revert-dpms-fix.patch
@@ -0,0 +1,128 @@
+From 9a8b44dd6fc63f2562a17395c54f5f439cad9008 Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.anc...@canonical.com>
+Date: Fri, 2 Oct 2015 14:22:42 +1300
+Subject: [PATCH xf86-video-intel 2/2] Revert "sna: Be robust in handling DPMS
+ failures"
+
+This reverts commit 7d9a74622e5a936e4860fcef8358619bf59adae8.
+---
+ src/sna/sna_display.c | 41 ++---
+ 1 file changed, 14 insertions(+), 27 deletions(-)
+
+Index: xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
+===
+--- xserver-xorg-video-intel-2.99.917+git20150808.orig/src/sna/sna_display.c
xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
+@@ -222,7 +222,7 @@ struct sna_output {
+ int panel_vdisplay;
+
+ uint32_t dpms_id;
+- uint8_t dpms_mode;
++ int dpms_mode;
+ struct backlight backlight;
+ int backlight_active_level;
+
+@@ -260,7 +260,6 @@ enum { /* XXX copied from hw/xfree86/mod
+ OPTION_DEFAULT_MODES,
+ };
+
+-static void __sna_output_dpms(xf86OutputPtr output, int dpms, int fixup);
+ static void sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc);
+
+ static bool is_zaphod(ScrnInfoPtr scrn)
+@@ -969,7 +968,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr cr
+ if (output->crtc != crtc)
+ continue;
+
+- __sna_output_dpms(output, DPMSModeOn, false);
++ output->funcs->dpms(output, DPMSModeOn);
+ }
+
+ #if XF86_CRTC_VERSION >= 3
+@@ -999,7 +998,7 @@ sna_crtc_force_outputs_off(xf86CrtcPtr c
+ if (output->crtc != crtc)
+ continue;
+
+- __sna_output_dpms(output, DPMSModeOff, false);
++ output->funcs->dpms(output, DPMSModeOff);
+ }
+ }
+
+@@ -1135,7 +1134,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
+* and we lose track of the user settings.
+*/
+ if (output->crtc == NULL)
+- __sna_output_dpms(output, DPMSModeOff, false);
++ output->funcs->dpms(output, DPMSModeOff);
+
+ if (output->crtc != crtc)
+ continue;
+@@ -3650,7 +3649,7 @@ sna_output_destroy(xf86OutputPtr output)
+ }
+
+ static void
+-__sna_output_dpms(xf86OutputPtr output, int dpms, int fixup)
++sna_output_dpms(xf86OutputPtr output, int dpms)
+ {
+ struct sna *sna = to_sna(output->scrn);
+ struct sna_output *sna_output = output->driver_private;
+@@ -3677,9 +3676,8 @@ __sna_output_dpms(xf86OutputPtr output,
+ if (sna_output->backlight.iface && dpms != DPMSModeOn) {
+ if (old_dpms == DPMSModeOn) {
+ sna_output->backlight_active_level =
sna_output_backlight_get(output);
+- DBG(("%s(%s:%d): saving current backlight %d\n",
+- __FUNCTION__, output->name, sna_output->id,
+- sna_output->backlight_active_level));
++ DBG(("%s: saving current backlight %d\n",
++ __FUNCTION__, sna_output->backlight_active_level));
+ }
+ sna_output->dpms_mode = dpms;
+ sna_output_backlight_off(sna_output);
+@@ -3689,31 +3687,18 @@ __sna_output_dpms(xf86OutputPtr output,
+ drmModeConnectorSetProperty(sna->kgem.fd,
+ sna_output->id,
+ sna_output->dpms_id,
+- dpms)) {
+- DBG(("%s(%s:%d): failed to set DPMS to %d (fixup? %d)\n",
+- __FUNCTION__,
Re: Fixing -dev package names in libxcb
What exactly was blocked? Was it just because xcb-util was in the NEW queue since it added new binary packages? On Wed, Sep 2, 2015 at 12:04 AM Timo Aaltonen <tjaal...@ubuntu.com> wrote: > On 12.08.2015 01:13, Robert Ancell wrote: > > No, the reverse dependencies don't need updating due to the transitional > > packages. Over time they should be updated but there's no pressure to > > rush it. > > Actually it's not true, the binary dependencies would still be wrong and > to fix those rebuilds are necessary. That's exactly why xcb-util is > blocking xorg-server uploads entering wily on ubuntu right now :) > (because xcb-util hasn't transitioned yet) > > > > -- > t >
libinput: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits:
libinput: Changes to 'ubuntu'
debian/changelog | 10 debian/libinput10.symbols | 11 debian/patches/fix-litest.patch | 44 debian/patches/series |2 debian/patches/touch-point-orientation-size.patch | 1675 ++ 5 files changed, 1742 insertions(+) New commits: commit 28c3fd8ff064ee5ec7f2f2644e5a493c7d91add4 Author: Robert Ancell robert.anc...@canonical.com Date: Mon Aug 24 15:56:17 2015 +0100 * debian/patches/touch-point-orientation-size.patch: * debian/patches/fix-litest.patch: - Add support for touchscreen contact properties (LP: #1488064) * debian/libinput10.symbols: - Updated diff --git a/debian/changelog b/debian/changelog index 6f96377..8159edb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libinput (0.21.0-1ubuntu1) wily; urgency=medium + + * debian/patches/touch-point-orientation-size.patch: + * debian/patches/fix-litest.patch: +- Add support for touchscreen contact properties (LP: #1488064) + * debian/libinput10.symbols: +- Updated + + -- Robert Ancell robert.anc...@canonical.com Mon, 24 Aug 2015 13:13:32 +0100 + libinput (0.21.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/libinput10.symbols b/debian/libinput10.symbols index 406f01e..eb427b6 100644 --- a/debian/libinput10.symbols +++ b/debian/libinput10.symbols @@ -6,6 +6,7 @@ libinput.so.10 libinput10 #MINVER# LIBINPUT_0.19.0@LIBINPUT_0.19.0 0.21.0 LIBINPUT_0.20.0@LIBINPUT_0.20.0 0.21.0 LIBINPUT_0.21.0@LIBINPUT_0.21.0 0.21.0 + LIBINPUT_0.22.0@LIBINPUT_0.22.0 0.21.0-1ubuntu1 libinput_config_status_to_str@LIBINPUT_0.12.0 0.15.0 libinput_device_config_accel_get_default_speed@LIBINPUT_0.12.0 0.15.0 libinput_device_config_accel_get_speed@LIBINPUT_0.12.0 0.15.0 @@ -123,6 +124,12 @@ libinput.so.10 libinput10 #MINVER# libinput_event_pointer_get_time_usec@LIBINPUT_0.21.0 0.21.0 libinput_event_pointer_has_axis@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_base_event@LIBINPUT_0.12.0 0.15.0 + libinput_event_touch_get_major@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_major_transformed@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_minor@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_minor_transformed@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_orientation@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_pressure@LIBINPUT_0.22.0 0.21.0-1ubuntu1 libinput_event_touch_get_seat_slot@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_slot@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_time@LIBINPUT_0.12.0 0.15.0 @@ -131,6 +138,10 @@ libinput.so.10 libinput10 #MINVER# libinput_event_touch_get_x_transformed@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_y@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_y_transformed@LIBINPUT_0.12.0 0.15.0 + libinput_event_touch_has_major@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_has_minor@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_has_orientation@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_has_pressure@LIBINPUT_0.22.0 0.21.0-1ubuntu1 libinput_get_event@LIBINPUT_0.12.0 0.15.0 libinput_get_fd@LIBINPUT_0.12.0 0.15.0 libinput_get_user_data@LIBINPUT_0.12.0 0.15.0 diff --git a/debian/patches/fix-litest.patch b/debian/patches/fix-litest.patch new file mode 100644 index 000..e476d8d --- /dev/null +++ b/debian/patches/fix-litest.patch @@ -0,0 +1,44 @@ +With this change auto assign events will be skipped if no replacement value +is provided. This behavior is practical when emitting mt events, as those +only contain the axis values that changed. + +Signed-off-by: Andreas Pokorny andreas.pokorny at canonical.com +--- + test/litest.c | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/litest.c b/test/litest.c +index 26c5e43..8fc7bca 100644 +--- a/test/litest.c b/test/litest.c +@@ -1292,7 +1292,6 @@ litest_auto_assign_value(struct litest_device *d, + value = touching ? 0 : 1; + break; + default: +- value = -1; + if (!axis_replacement_value(axes, ev-code, value) + d-interface-get_axis_default) + d-interface-get_axis_default(d, ev-code, value); +@@ -1342,8 +1341,8 @@ litest_slot_start(struct litest_device *d, +y, +axes, +touching); +- +- litest_event(d, ev-type, ev-code, value); ++ if (value != LITEST_AUTO_ASSIGN) ++ litest_event(d, ev-type, ev-code, value); + ev++; + } + } +@@ -1428,7 +1427,8 @@ litest_slot_move(struct litest_device *d, +y, +axes
xorg-server: Changes to 'ubuntu'
debian/changelog | 14
debian/patches/xmir-desktop-file-hint-flag.patch |4 +-
debian/patches/xmir-rootless.patch | 34 ++---
debian/patches/xmir.patch| 36 +--
4 files changed, 60 insertions(+), 28 deletions(-)
New commits:
commit 57450213538280a57d6601fc4d4e5f493b6df0d5
Author: Robert Ancell robert.anc...@canonical.com
Date: Fri Aug 21 14:51:34 2015 +1200
debian/patches/xmir-rootless.patch:
* debian/patches/xmir-rootless.patch:
- Fix crash when running XMir in rootless mode (LP: #1472097)
diff --git a/debian/changelog b/debian/changelog
index 3f37f39..5d373f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu4) wily; urgency=medium
+
+ * debian/patches/xmir-rootless.patch:
+- Fix crash when running XMir in rootless mode (LP: #1472097)
+
+ -- Robert Ancell robert.anc...@canonical.com Thu, 20 Aug 2015 16:31:37
+1200
+
xorg-server (2:1.17.2-1ubuntu3) wily; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
index b6b7bbd..f3bef1e 100644
--- a/debian/patches/xmir-rootless.patch
+++ b/debian/patches/xmir-rootless.patch
@@ -1,4 +1,4 @@
-From 2cf1ea480b7ebcecc61509a54b27b685c4ccfc53 Mon Sep 17 00:00:00 2001
+From a7b78b9c0eee1a53e0fed309474aa6cc76656ffc Mon Sep 17 00:00:00 2001
From: Robert Ancell robert.anc...@canonical.com
Date: Thu, 9 Jul 2015 14:03:49 +1200
Subject: [PATCH 2/4] xmir: Support rootless
@@ -167,7 +167,7 @@ index f958e87..c1770d5 100644
xmir_screen-windowed = 1;
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-index 4afd66e..ef78cca 100644
+index 4afd66e..13224aa 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
@@ -33,6 +33,7 @@
@@ -202,14 +202,14 @@ index 4afd66e..ef78cca 100644
-if (window-parent)
-return ret;
-+if (xmir_screen-rootless) {
-+if (!window-parent) {
-+CompositeRedirectSubwindows(window,
/*CompositeRedirectManual*/TRUE); // WTF? Where is this defined
-+RegionNull(window-clipList);
-+RegionNull(window-borderClip);
-+RegionNull(window-winSize);
-+}
++if (xmir_screen-rootless !window-parent) {
++RegionNull(window-clipList);
++RegionNull(window-borderClip);
++RegionNull(window-winSize);
++}
+
++if (xmir_screen-rootless) {
++CompositeRedirectSubwindows(window, /*CompositeRedirectManual*/TRUE);
// WTF? Where is this defined
+if (window-redirectDraw != RedirectDrawManual)
+return ret;
+}
@@ -292,5 +292,5 @@ index e43fa40..b67f3a1 100644
CreateScreenResourcesProcPtr CreateScreenResources;
CloseScreenProcPtr CloseScreen;
--
-2.4.6
+2.5.0
commit e66034f70fbf0962877cfd3adfe18d3503d54aa9
Author: Robert Ancell robert.anc...@canonical.com
Date: Fri Aug 21 14:51:20 2015 +1200
debian/patches/xmir.patch:
* debian/patches/xmir.patch:
- Fix red and blue channels being swapped on Android drivers (LP:
#1471146)
diff --git a/debian/changelog b/debian/changelog
index 6b05edc..3f37f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu3) wily; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix red and blue channels being swapped on Android drivers (LP: #1471146)
+
+ -- Robert Ancell robert.anc...@canonical.com Thu, 30 Jul 2015 15:31:29
+1200
+
xorg-server (2:1.17.2-1ubuntu2) wily; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
index 8b3a1dd..7dbc73a 100644
--- a/debian/patches/xmir-desktop-file-hint-flag.patch
+++ b/debian/patches/xmir-desktop-file-hint-flag.patch
@@ -1,4 +1,4 @@
-From cc91948d4be69af96ddf9417a4b3cfac5d0f0f35 Mon Sep 17 00:00:00 2001
+From 938313b76b0e3279a94af931cbe5fd34b8cb580c Mon Sep 17 00:00:00 2001
From: Robert Ancell robert.anc...@canonical.com
Date: Mon, 13 Jul 2015 15:54:32 +1200
Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag required by Unity8
@@ -9,7 +9,7 @@ Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag
required by Unity8
1 file changed, 3 insertions(+)
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-index 2a7227e..810b715 100644
+index ef78cca..b9b7f2d 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
@@ -123,6 +123,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
index 4f0196a..b6b7bbd 100644
--- a/debian/patches/xmir-rootless.patch
+++ b/debian/patches/xmir-rootless.patch
@@ -1,4 +1,4 @@
-From 3c705fcf4a68de1276d1a2f6ee176ec7e62eb9df Mon Sep 17 00:00:00 2001
+From 2cf1ea480b7ebcecc61509a54b27b685c4ccfc53 Mon Sep 17 00:00:00 2001
From: Robert Ancell robert.anc
xcb-util: Changes to 'debian-unstable'
debian/control |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7fbea87817f4b0365745eecdd242067ea0306815
Author: Robert Ancell robert.anc...@canonical.com
Date: Mon Aug 17 13:51:29 2015 +1200
Add breaks/replaces so libxcb-util-dev is correctly migrated
diff --git a/debian/control b/debian/control
index 7d232ca..76b1352 100644
--- a/debian/control
+++ b/debian/control
@@ -44,11 +44,13 @@ Conflicts: libxcb-atom1-dev,
libxcb-event1-dev,
libxcb-reply1-dev,
libxcb-property1-dev
+Breaks: libxcb-util0-dev ( 0.4.0-1)
Replaces: libxcb-atom1-dev,
libxcb-aux0-dev,
libxcb-event1-dev,
libxcb-reply1-dev,
libxcb-property1-dev
+ libxcb-util0-dev ( 0.4.0-1)
Architecture: any
Depends: libxcb-util1 (= ${binary:Version}),
libxcb1-dev,
xcb-util: Changes to 'debian-unstable'
debian/control |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aa4bef555e10abb3601809d7d26a94c6964ae069
Author: Robert Ancell robert.anc...@canonical.com
Date: Mon Aug 17 13:56:35 2015 +1200
Add missing comma
diff --git a/debian/control b/debian/control
index 76b1352..524e4d8 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Replaces: libxcb-atom1-dev,
libxcb-aux0-dev,
libxcb-event1-dev,
libxcb-reply1-dev,
- libxcb-property1-dev
+ libxcb-property1-dev,
libxcb-util0-dev ( 0.4.0-1)
Architecture: any
Depends: libxcb-util1 (= ${binary:Version}),
Re: Fwd: Re: xcb-util: Changes to 'debian-unstable'
You said it's not worth the trouble - I don't think it's any signficant trouble... There's no transition required that I know of - all existing packages will continue to build fine using the transitional libxcb-util0-dev package and over time build-dependencies will be updated and this package can be removed. It's marked as oldlibs/extra so the automatic tools will pick this up. --Robert [1] https://wiki.debian.org/Renaming_a_Package On Tue, Aug 11, 2015 at 5:38 PM Timo Aaltonen tjaal...@debian.org wrote: On 11.08.2015 08:03, Timo Aaltonen wrote: so will you handle the migration on Debian too? since pkg-xorg won't right, so with another look it indeed looks like the sover got bumped in _this_ version and not before.. ugh, sorry about that! still needs the transition -- t
Re: Fixing -dev package names in libxcb
Hi Julien, The work is already done in this patch - do you see any ongoing issues? Reasons I see for doing the renaming: - It's confusing for users to work out the name of the -dev packages to install. - It gives the incorrect impression you can install multiple -dev packages. - It means each time a library bumps soname then someone has to do a part of this patch (e.g. as was done for libxcb-sync-dev). Or it gets forgotten. Or the soname is added to the -dev package requiring a migration and another the next time it happens. - It confuses new packagers into thinking they need the soname in the -dev package. --Robert On Tue, Aug 11, 2015 at 8:26 PM Julien Cristau jcris...@debian.org wrote: On Tue, Aug 11, 2015 at 04:14:36 +, Robert Ancell wrote: Hi, I'd like to fix the -dev package names in libxcb - they currently have a version number on them which is not correct. The git branch for libxcb seems to be owned by collab-maint - should that be changed to pkg-xorg? I've attached a patch that fixes these package names, please let me know how to commit this to an appropriate branch. I don't think we should change those package names, it's just a bunch of work for no benefit IMO. Cheers, Julien
Re: Fixing -dev package names in libxcb
No, the reverse dependencies don't need updating due to the transitional packages. Over time they should be updated but there's no pressure to rush it. --Robert On Wed, Aug 12, 2015 at 10:00 AM Julien Cristau jcris...@debian.org wrote: On Tue, Aug 11, 2015 at 21:43:39 +, Robert Ancell wrote: Hi Julien, The work is already done in this patch - do you see any ongoing issues? All the reverse dependencies would need changes too. Cheers, Julien
Fixing -dev package names in libxcb
Hi, I'd like to fix the -dev package names in libxcb - they currently have a version number on them which is not correct. The git branch for libxcb seems to be owned by collab-maint - should that be changed to pkg-xorg? I've attached a patch that fixes these package names, please let me know how to commit this to an appropriate branch. Thanks, --Robert From 6aaa66553a51e413cf89b4f5f4740c53cf24a1e0 Mon Sep 17 00:00:00 2001 From: Robert Ancell robert.anc...@canonical.com Date: Tue, 11 Aug 2015 12:43:49 +1200 Subject: [PATCH] Fix -dev package naming by dropping versioned numbers and adding transitional packages. --- debian/changelog | 7 + debian/control | 380 - debian/libxcb-composite-dev.install| 4 + debian/libxcb-composite0-dev.install | 4 - debian/libxcb-damage-dev.install | 4 + debian/libxcb-damage0-dev.install | 4 - debian/libxcb-dev.install | 8 + debian/libxcb-dpms-dev.install | 4 + debian/libxcb-dpms0-dev.install| 4 - debian/libxcb-dri2-0-dev.install | 4 - debian/libxcb-dri2-dev.install | 4 + debian/libxcb-glx-dev.install | 4 + debian/libxcb-glx0-dev.install | 4 - debian/libxcb-randr-dev.install| 4 + debian/libxcb-randr0-dev.install | 4 - debian/libxcb-record-dev.install | 4 + debian/libxcb-record0-dev.install | 4 - debian/libxcb-render-dev.install | 4 + debian/libxcb-render0-dev.install | 4 - debian/libxcb-res-dev.install | 4 + debian/libxcb-res0-dev.install | 4 - debian/libxcb-screensaver-dev.install | 4 + debian/libxcb-screensaver0-dev.install | 4 - debian/libxcb-shape-dev.install| 4 + debian/libxcb-shape0-dev.install | 4 - debian/libxcb-shm-dev.install | 4 + debian/libxcb-shm0-dev.install | 4 - debian/libxcb-xevie-dev.install| 4 + debian/libxcb-xevie0-dev.install | 4 - debian/libxcb-xf86dri-dev.install | 4 + debian/libxcb-xf86dri0-dev.install | 4 - debian/libxcb-xfixes-dev.install | 4 + debian/libxcb-xfixes0-dev.install | 4 - debian/libxcb-xinerama-dev.install | 4 + debian/libxcb-xinerama0-dev.install| 4 - debian/libxcb-xprint-dev.install | 4 + debian/libxcb-xprint0-dev.install | 4 - debian/libxcb-xtest-dev.install| 4 + debian/libxcb-xtest0-dev.install | 4 - debian/libxcb-xv-dev.install | 4 + debian/libxcb-xv0-dev.install | 4 - debian/libxcb-xvmc-dev.install | 4 + debian/libxcb-xvmc0-dev.install| 4 - debian/libxcb1-dev.install | 8 - debian/rules | 2 +- 45 files changed, 422 insertions(+), 143 deletions(-) create mode 100644 debian/libxcb-composite-dev.install delete mode 100644 debian/libxcb-composite0-dev.install create mode 100644 debian/libxcb-damage-dev.install delete mode 100644 debian/libxcb-damage0-dev.install create mode 100644 debian/libxcb-dev.install create mode 100644 debian/libxcb-dpms-dev.install delete mode 100644 debian/libxcb-dpms0-dev.install delete mode 100644 debian/libxcb-dri2-0-dev.install create mode 100644 debian/libxcb-dri2-dev.install create mode 100644 debian/libxcb-glx-dev.install delete mode 100644 debian/libxcb-glx0-dev.install create mode 100644 debian/libxcb-randr-dev.install delete mode 100644 debian/libxcb-randr0-dev.install create mode 100644 debian/libxcb-record-dev.install delete mode 100644 debian/libxcb-record0-dev.install create mode 100644 debian/libxcb-render-dev.install delete mode 100644 debian/libxcb-render0-dev.install create mode 100644 debian/libxcb-res-dev.install delete mode 100644 debian/libxcb-res0-dev.install create mode 100644 debian/libxcb-screensaver-dev.install delete mode 100644 debian/libxcb-screensaver0-dev.install create mode 100644 debian/libxcb-shape-dev.install delete mode 100644 debian/libxcb-shape0-dev.install create mode 100644 debian/libxcb-shm-dev.install delete mode 100644 debian/libxcb-shm0-dev.install create mode 100644 debian/libxcb-xevie-dev.install delete mode 100644 debian/libxcb-xevie0-dev.install create mode 100644 debian/libxcb-xf86dri-dev.install delete mode 100644 debian/libxcb-xf86dri0-dev.install create mode 100644 debian/libxcb-xfixes-dev.install delete mode 100644 debian/libxcb-xfixes0-dev.install create mode 100644 debian/libxcb-xinerama-dev.install delete mode 100644 debian/libxcb-xinerama0-dev.install create mode 100644 debian/libxcb-xprint-dev.install delete mode 100644 debian/libxcb-xprint0-dev.install create mode 100644 debian/libxcb-xtest-dev.install delete mode 100644 debian/libxcb-xtest0-dev.install create mode 100644 debian/libxcb-xv-dev.install delete mode 100644 debian/libxcb-xv0-dev.install create mode 100644 debian/libxcb-xvmc-dev.install delete mode
xcb-util: Changes to 'debian-unstable'
debian/changelog| 12
debian/control | 19 +++
debian/libxcb-util-dev.install |4
debian/libxcb-util0-dev.install |4
debian/libxcb-util0.install |1 -
debian/libxcb-util1.install |1 +
6 files changed, 32 insertions(+), 9 deletions(-)
New commits:
commit c5e0a94e39e70e3e2f54c5e9235de55fa6e8e2f9
Author: Robert Ancell robert.anc...@canonical.com
Date: Tue Aug 11 12:08:50 2015 +1200
* New upstream release.
* debian/control:
- Use standards version 3.9.6
- Drop build-depends on x11proto-core-dev
- Rename libxcb-util0 to libxcb-util1
- Rename libxcb-util0-dev to libxcb-util-dev
- Add transitional libxcb-util0-dev package
diff --git a/debian/changelog b/debian/changelog
index a6defe5..5bb1028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xcb-util (0.4.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * debian/control:
+- Use standards version 3.9.6
+- Drop build-depends on x11proto-core-dev
+- Rename libxcb-util0 to libxcb-util1
+- Rename libxcb-util0-dev to libxcb-util-dev
+- Add transitional libxcb-util0-dev package
+
+ -- Robert Ancell robert.anc...@canonical.com Tue, 11 Aug 2015 12:01:14
+1200
+
xcb-util (0.3.8-3) unstable; urgency=medium
* debian/control, debian/rules:
diff --git a/debian/control b/debian/control
index bd8e983..a02c02b 100644
--- a/debian/control
+++ b/debian/control
@@ -17,12 +17,12 @@ Build-Depends: cdbs ( = 0.4.93),
automake,
xutils-dev,
dh-autoreconf
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://xcb.freedesktop.org
Vcs-Git: git://git.debian.org/pkg-xorg/lib/xcb-util.git
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xcb-util.git
-Package: libxcb-util0
+Package: libxcb-util1
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
@@ -39,7 +39,7 @@ Description: utility libraries for X C Binding -- atom, aux
and event
libraries also provide client-side code which is not strictly part of
the X protocol but which have traditionally been provided by Xlib.
-Package: libxcb-util0-dev
+Package: libxcb-util-dev
Conflicts: libxcb-atom1-dev,
libxcb-aux0-dev,
libxcb-event1-dev,
@@ -51,7 +51,7 @@ Replaces: libxcb-atom1-dev,
libxcb-reply1-dev,
libxcb-property1-dev
Architecture: any
-Depends: libxcb-util0 (= ${binary:Version}),
+Depends: libxcb-util1 (= ${binary:Version}),
libxcb1-dev,
${misc:Depends}
Multi-Arch: same
@@ -65,3 +65,14 @@ Description: utility libraries for X C Binding -- atom, aux
and event
and interfaces which make the raw X protocol more usable. Some of the
libraries also provide client-side code which is not strictly part of
the X protocol but which have traditionally been provided by Xlib.
+
+Package: libxcb-util0-dev
+Section: libdevel
+Architecture: any
+Depends: libxcb-util-dev (= ${binary:Version})
+Multi-Arch: same
+Description: dummy transitional package for utility libraries for X C Binding
-- atom, aux and event
+ This is a transitional dummy package for libxcb-util0-dev to
+ libxcb-util-dev migration.
+ .
+ This package can be safely removed.
diff --git a/debian/libxcb-util-dev.install b/debian/libxcb-util-dev.install
new file mode 100644
index 000..7d0ad47
--- /dev/null
+++ b/debian/libxcb-util-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/*.h
+usr/lib/*/libxcb-util.a
+usr/lib/*/libxcb-util.so
+usr/lib/*/pkgconfig/*.pc
diff --git a/debian/libxcb-util0-dev.install b/debian/libxcb-util0-dev.install
deleted file mode 100644
index 7d0ad47..000
--- a/debian/libxcb-util0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/xcb/*.h
-usr/lib/*/libxcb-util.a
-usr/lib/*/libxcb-util.so
-usr/lib/*/pkgconfig/*.pc
diff --git a/debian/libxcb-util0.install b/debian/libxcb-util0.install
deleted file mode 100644
index bdc40ab..000
--- a/debian/libxcb-util0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libxcb-util.so.*
diff --git a/debian/libxcb-util1.install b/debian/libxcb-util1.install
new file mode 100644
index 000..bdc40ab
--- /dev/null
+++ b/debian/libxcb-util1.install
@@ -0,0 +1 @@
+usr/lib/*/libxcb-util.so.*
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zox7h-0007nf...@moszumanska.debian.org
xcb-util: Changes to 'debian-unstable'
debian/control |1 - 1 file changed, 1 deletion(-) New commits: commit d32ccc34697a307735193af63e98d122922cee67 Author: Robert Ancell robert.anc...@canonical.com Date: Tue Aug 11 12:11:13 2015 +1200 Remove build-depends as mentioned in changelog diff --git a/debian/control b/debian/control index a02c02b..fda9a6b 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Build-Depends: cdbs ( = 0.4.93), pkg-config, m4, libtool, - x11proto-core-dev (= 7.0.12), autotools-dev, autoconf, automake, -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zox9y-0008mk...@moszumanska.debian.org
xcb-util: Changes to 'debian-unstable'
debian/changelog|2 ++ debian/libxcb-util1.symbols | 27 +++ 2 files changed, 29 insertions(+) New commits: commit ae7fafb2a45bc2a2c54b1c1c260cc40157731a5d Author: Robert Ancell robert.anc...@canonical.com Date: Tue Aug 11 12:18:57 2015 +1200 * debian/libxcb-util1.symbols: - Track library symbols diff --git a/debian/changelog b/debian/changelog index 5bb1028..e25ea3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ xcb-util (0.4.0-1) UNRELEASED; urgency=medium - Rename libxcb-util0 to libxcb-util1 - Rename libxcb-util0-dev to libxcb-util-dev - Add transitional libxcb-util0-dev package + * debian/libxcb-util1.symbols: +- Track library symbols -- Robert Ancell robert.anc...@canonical.com Tue, 11 Aug 2015 12:01:14 +1200 diff --git a/debian/libxcb-util1.symbols b/debian/libxcb-util1.symbols new file mode 100644 index 000..dc1a040 --- /dev/null +++ b/debian/libxcb-util1.symbols @@ -0,0 +1,27 @@ +libxcb-util.so.1 libxcb-util1 #MINVER# + xcb_atom_name_by_resource@Base 0.4.0 + xcb_atom_name_by_screen@Base 0.4.0 + xcb_atom_name_unique@Base 0.4.0 + xcb_aux_change_gc@Base 0.4.0 + xcb_aux_change_gc_checked@Base 0.4.0 + xcb_aux_change_keyboard_control@Base 0.4.0 + xcb_aux_change_window_attributes@Base 0.4.0 + xcb_aux_change_window_attributes_checked@Base 0.4.0 + xcb_aux_clear_window@Base 0.4.0 + xcb_aux_configure_window@Base 0.4.0 + xcb_aux_create_gc@Base 0.4.0 + xcb_aux_create_gc_checked@Base 0.4.0 + xcb_aux_create_window@Base 0.4.0 + xcb_aux_create_window_checked@Base 0.4.0 + xcb_aux_find_visual_by_attrs@Base 0.4.0 + xcb_aux_find_visual_by_id@Base 0.4.0 + xcb_aux_get_depth@Base 0.4.0 + xcb_aux_get_depth_of_visual@Base 0.4.0 + xcb_aux_get_screen@Base 0.4.0 + xcb_aux_get_visualtype@Base 0.4.0 + xcb_aux_parse_color@Base 0.4.0 + xcb_aux_set_line_attributes_checked@Base 0.4.0 + xcb_aux_sync@Base 0.4.0 + xcb_event_get_error_label@Base 0.4.0 + xcb_event_get_label@Base 0.4.0 + xcb_event_get_request_label@Base 0.4.0 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zoxhu-0001q4...@moszumanska.debian.org
xcb-util: Changes to 'debian-unstable'
debian/control |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 89ed0f8a8fc56a1972e0ca4c990090ecabff42d7
Author: Robert Ancell robert.anc...@canonical.com
Date: Tue Aug 11 12:28:27 2015 +1200
Add misc:Depends to transition libxcb-util0-dev to keep lintian happy
diff --git a/debian/control b/debian/control
index fda9a6b..7d232ca 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,8 @@ Description: utility libraries for X C Binding -- atom, aux
and event
Package: libxcb-util0-dev
Section: libdevel
Architecture: any
-Depends: libxcb-util-dev (= ${binary:Version})
+Depends: libxcb-util-dev (= ${binary:Version}),
+ ${misc:Depends}
Multi-Arch: same
Description: dummy transitional package for utility libraries for X C Binding
-- atom, aux and event
This is a transitional dummy package for libxcb-util0-dev to
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zoxqe-0003qy...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog| 30 -- debian/control |5 - debian/patches/fix-sna-external-slave-rotation.patch| 17 +++-- debian/patches/fix-sna-fstat-include.patch | 20 +++--- debian/patches/fix-uxa-fstat-include.patch | 10 +-- debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch|1 debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff | 13 ++-- 7 files changed, 58 insertions(+), 38 deletions(-) New commits: commit c5b7e6f95f8a9b49a49b87c83922f01610a58445 Author: Robert Ancell robert.anc...@canonical.com Date: Thu Aug 6 10:03:53 2015 +1200 * Merge with Debian, remaining Ubuntu changes: * debian/rules: - Fix valgrind-enabling check (DEB_HOST_ARCH_OS instead of DEB_HOST_ARCH) - Use SNA by default. * debian/patches/fix-sna-external-slave-rotation.patch: - Fix rotating external display with optimus results in corruption. * debian/patches/fix-sna-fstat-include.patch: * debian/patches/fix-uxa-fstat-include.patch: - Fix missing include for fstat * debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch: - Fix faulty yuv2rgb translation on Intel Generation 8 Graphics. * debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff: - Fix rotation on SKL. diff --git a/debian/changelog b/debian/changelog index 08502ec..9130413 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +xserver-xorg-video-intel (2:2.99.917-1ubuntu1) wily; urgency=medium + + * Merge with Debian, remaining Ubuntu changes: + * debian/rules: +- Fix valgrind-enabling check (DEB_HOST_ARCH_OS instead of DEB_HOST_ARCH) +- Use SNA by default. + * debian/patches/fix-sna-external-slave-rotation.patch: +- Fix rotating external display with optimus results in corruption. + * debian/patches/fix-sna-fstat-include.patch: + * debian/patches/fix-uxa-fstat-include.patch: +- Fix missing include for fstat + * debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch: +- Fix faulty yuv2rgb translation on Intel Generation 8 Graphics. + * debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff: +- Fix rotation on SKL. + + -- Robert Ancell robert.anc...@canonical.com Tue, 14 Jul 2015 15:21:57 +1200 + +xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium + + * Upload to unstable. (Closes: #748753) + + -- Vincent Cheng vch...@debian.org Thu, 07 May 2015 00:46:06 -0700 + xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu3) wily; urgency=medium * debian/patches/xmir.patch: @@ -38,12 +62,6 @@ xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu1) vivid; urgency=medium -- Timo Aaltonen tjaal...@debian.org Tue, 13 Jan 2015 12:39:09 +0200 -xserver-xorg-video-intel (2:2.99.917-1~exp2) UNRELEASED; urgency=medium - - * rules: Fix valgrind-enabling check. - - -- Timo Aaltonen tjaal...@debian.org Tue, 13 Jan 2015 12:34:17 +0200 - xserver-xorg-video-intel (2:2.99.917-1~exp1) experimental; urgency=medium * New upstream prerelease 2.99.917. diff --git a/debian/control b/debian/control index ab5fffe..ddc71e9 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,7 @@ Build-Depends: debhelper (= 8), dh-autoreconf, pkg-config, -# Depend on latest server to ensure XMir support - xserver-xorg-dev (= 2:1.14.2.901-2ubuntu4~), + xserver-xorg-dev (= 2:1.11.99.901), x11proto-core-dev, x11proto-fonts-dev, x11proto-xinerama-dev, @@ -37,7 +36,7 @@ Build-Depends: libxcb-dri2-0-dev, # end xvmc libudev-dev [linux-any], - quilt (= 0.46-7~), + quilt, xutils-dev (= 1:7.5+4), valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x], # intel-virtual-output: diff --git a/debian/patches/fix-sna-external-slave-rotation.patch b/debian/patches/fix-sna-external-slave-rotation.patch index 80b79f3..5251194 100644 --- a/debian/patches/fix-sna-external-slave-rotation.patch +++ b/debian/patches/fix-sna-external-slave-rotation.patch @@ -1,6 +1,7 @@ commit 1cffbd9a8e96642bdbabf4e40829a5f1473b5bf9 Author: Chris Wilson ch...@chris-wilson.co.uk Date: Tue Jan 13 10:50:36 2015 + +Bug-Ubuntu: https://launchpad.net/bugs/1410238 sna: Combine slave CRTC offsets with rotation @@ -11,11 +12,11 @@ Date: Tue Jan 13 10:50:36 2015 + Reported-by: Maarten Lankhorst maarten.lankho...@canonical.com Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk -diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c -index 569c585..0657c47 100644 a/src/sna/sna_display.c -+++ b/src/sna/sna_display.c -@@ -6696,6 +6696,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo +Index: xserver-xorg-video-intel-2.99.917/src/sna/sna_display.c +=== +--- xserver-xorg-video-intel-2.99.917.orig
xorg-server: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af329b148c1b01d2edf90483ef219e8b7fb41b82 Author: Robert Ancell robert.anc...@canonical.com Date: Wed Jul 29 15:43:41 2015 +1200 releasing package xorg-server version 2:1.17.2-1ubuntu2 diff --git a/debian/changelog b/debian/changelog index 827c9da..6b05edc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.17.2-1ubuntu2) UNRELEASED; urgency=medium +xorg-server (2:1.17.2-1ubuntu2) wily; urgency=medium * debian/patches/xmir.patch: - Fix cursor crash -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zkiht-0002cx...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |9 +
debian/patches/series|1
debian/patches/xmir-desktop-file-hint-flag.patch | 27 +++
debian/patches/xmir-rootless.patch | 24 +--
debian/patches/xmir.patch| 179 ---
5 files changed, 147 insertions(+), 93 deletions(-)
New commits:
commit f904788ee3b0403680352c87e05245928d7df702
Author: Robert Ancell robert.anc...@canonical.com
Date: Wed Jul 29 15:13:39 2015 +1200
* debian/patches/xmir.patch:
- Fix cursor crash
* debian/patches/xmir-desktop-file-hint-flag.patch:
- Split Unity8 hack out from xmir.patch
diff --git a/debian/changelog b/debian/changelog
index d1d2f1b..827c9da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.2-1ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix cursor crash
+ * debian/patches/xmir-desktop-file-hint-flag.patch:
+- Split Unity8 hack out from xmir.patch
+
+ -- Robert Ancell robert.anc...@canonical.com Wed, 29 Jul 2015 14:18:31
+1200
+
xorg-server (2:1.17.2-1ubuntu1) wily; urgency=medium
[ Timo Aaltonen ]
diff --git a/debian/patches/series b/debian/patches/series
index cf2fcbe..bbac1ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,5 +48,6 @@ disable-rotation-transform-gpuscreens.patch
fix-ftbfs-ppc64el.patch
xmir.patch
xmir-rootless.patch
+xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
new file mode 100644
index 000..8b3a1dd
--- /dev/null
+++ b/debian/patches/xmir-desktop-file-hint-flag.patch
@@ -0,0 +1,27 @@
+From cc91948d4be69af96ddf9417a4b3cfac5d0f0f35 Mon Sep 17 00:00:00 2001
+From: Robert Ancell robert.anc...@canonical.com
+Date: Mon, 13 Jul 2015 15:54:32 +1200
+Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag required by Unity8
+ to decide which application is starting
+
+---
+ hw/xmir/xmir.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
+index 2a7227e..810b715 100644
+--- a/hw/xmir/xmir.c
b/hw/xmir/xmir.c
+@@ -123,6 +123,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
+ } else if (!strcmp(argv[i], -novtswitch) ||
+!strncmp(argv[i], vt, 2)) {
+ return 1;
++/* Bypass unity8 security */
++} else if (!strncmp(argv[i], --desktop_file_hint=,
strlen(--desktop_file_hint=))) {
++return 1;
+ } else if (!strcmp(argv[i], -fd)) {
+ if (!seen_shared)
+ NoListenAll = 1;
+--
+2.4.6
+
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
index 82b20b1..4f0196a 100644
--- a/debian/patches/xmir-rootless.patch
+++ b/debian/patches/xmir-rootless.patch
@@ -1,7 +1,7 @@
-From ae3f0599114144c26ab1de02320f000c86b2d042 Mon Sep 17 00:00:00 2001
+From 3c705fcf4a68de1276d1a2f6ee176ec7e62eb9df Mon Sep 17 00:00:00 2001
From: Robert Ancell robert.anc...@canonical.com
Date: Thu, 9 Jul 2015 14:03:49 +1200
-Subject: [PATCH 2/3] xmir: Support rootless
+Subject: [PATCH 2/4] xmir: Support rootless
Contributions from:
Maarten Lankhorst maarten.lankho...@ubuntu.com
@@ -56,10 +56,10 @@ index b96cb1d..f279013 100644
VisualID
parentVisual,
VisualID
winVisual);
diff --git a/hw/xmir/xmir-cursor.c b/hw/xmir/xmir-cursor.c
-index 143f008..dd9a8a7 100644
+index 459f9ac..c311d88 100644
--- a/hw/xmir/xmir-cursor.c
+++ b/hw/xmir/xmir-cursor.c
-@@ -131,7 +131,10 @@ xmir_input_set_cursor(struct xmir_input *xmir_input)
+@@ -134,7 +134,10 @@ xmir_input_set_cursor(struct xmir_input *xmir_input)
config = mir_cursor_configuration_from_buffer_stream(stream,
cursor-bits-xhot, cursor-bits-yhot);
apply:
@@ -72,7 +72,7 @@ index 143f008..dd9a8a7 100644
if (stream)
diff --git a/hw/xmir/xmir-dri2.c b/hw/xmir/xmir-dri2.c
-index 21de4f9..b88d089 100644
+index 1f7c1b0..4f95006 100644
--- a/hw/xmir/xmir-dri2.c
+++ b/hw/xmir/xmir-dri2.c
@@ -90,8 +90,12 @@ static struct xmir_window *
@@ -167,7 +167,7 @@ index f958e87..c1770d5 100644
xmir_screen-windowed = 1;
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-index ce30727..a598c0d 100644
+index c07457d..2a7227e 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
@@ -33,6 +33,7 @@
@@ -196,7 +196,7 @@ index ce30727..a598c0d 100644
strcmp(argv[i], -egl) == 0 ||
strcmp(argv[i], -egl_sync) == 0 ||
strcmp(argv[i], -2x) == 0 ||
-@@ -424,8 +427,21 @@ xmir_realize_window(WindowPtr window)
+@@ -422,8 +425,21 @@ xmir_realize_window(WindowPtr window)
xmir_screen-RealizeWindow = screen-RealizeWindow;
screen-RealizeWindow = xmir_realize_window;
@@ -220,7 +220,7 @@ index ce30727
xorg-server: Changes to 'ubuntu'
debian/changelog | 12 1 file changed, 12 insertions(+) New commits: commit 0def3643f5120aa93558280875ee76ac4c9f640b Author: Robert Ancell robert.anc...@canonical.com Date: Thu Jul 23 10:47:15 2015 +1200 Add already released changelog entry diff --git a/debian/changelog b/debian/changelog index 579f11b..be4e4b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,18 @@ xorg-server (2:1.17.1-2) unstable; urgency=medium -- Julien Cristau jcris...@debian.org Mon, 04 May 2015 22:04:01 +0200 +xorg-server (2:1.17.1-0ubuntu5) wily; urgency=medium + + * debain/patches/xmir.patch: +- Update from git branch, now builds against Mir 0.14.0 + * debian/patches/xmir-rootless.patch: +- Split out rootless support which requires more extensive changes to + existing X code. + * debian/control: +- Add build-depends on mir-client-platform-mesa-dev + + -- Robert Ancell robert.anc...@canonical.com Mon, 13 Jul 2015 11:33:23 +1200 + xorg-server (2:1.17.1-0ubuntu4) wily; urgency=medium * debian/control: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zi2nn-0002s4...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |6 ++ 1 file changed, 6 insertions(+) New commits: commit ee4a3bc0596d467bb8dee2f6deb984c38dfb4f13 Author: Robert Ancell robert.anc...@canonical.com Date: Thu Jul 23 10:52:18 2015 +1200 Add already released changelog entry diff --git a/debian/changelog b/debian/changelog index 9c56f89..3341a8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,12 @@ xorg-server (2:1.17.1-2) unstable; urgency=medium -- Julien Cristau jcris...@debian.org Mon, 04 May 2015 22:04:01 +0200 +xorg-server (2:1.17.1-0ubuntu6) wily; urgency=medium + + * No change rebuild against Mir 0.14.0 + + -- Robert Ancell robert.anc...@canonical.com Thu, 16 Jul 2015 10:37:45 +1200 + xorg-server (2:1.17.1-0ubuntu5) wily; urgency=medium * debain/patches/xmir.patch: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zi2sd-0003fn...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c8e73b3f2bea9606a41edb1235b7d1d42ba509bd Author: Robert Ancell robert.anc...@canonical.com Date: Thu Jul 23 11:05:04 2015 +1200 Releasing 1.17.2-1ubuntu1 diff --git a/debian/changelog b/debian/changelog index 3341a8e..d1d2f1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.17.2-1ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.17.2-1ubuntu1) wily; urgency=medium [ Timo Aaltonen ] * Merge from Debian unstable. (LP: #1471185) @@ -13,7 +13,7 @@ xorg-server (2:1.17.2-1ubuntu1) UNRELEASED; urgency=medium * debian/xserver-xorg-core.install: - Simplify man page install - -- Timo Aaltonen tjaal...@debian.org Wed, 03 Jun 2015 11:41:03 +0300 + -- Robert Ancell robert.anc...@canonical.com Thu, 23 Jul 2015 11:04:33 +1200 xorg-server (2:1.17.2-1) unstable; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zi34p-0006xu...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 5b0482651708a60b1d09e115f92568524b2a348a Author: Robert Ancell robert.anc...@canonical.com Date: Thu Jul 23 10:49:02 2015 +1200 Update changelog diff --git a/debian/changelog b/debian/changelog index be4e4b1..9c56f89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,18 @@ xorg-server (2:1.17.2-1ubuntu1) UNRELEASED; urgency=medium + [ Timo Aaltonen ] * Merge from Debian unstable. (LP: #1471185) - * xserver-xorg-xmir.install: Removed, not used anymore. * fix-int10.patch: Dropped, upstream. * pixman-validate.patch: Dropped, not upstream and not needed since pixman got fixed. * mi-dont-process-disabled.patch: This has been upstream for some time now, drop it. + [ Robert Ancell ] + * Add patch headers + * debian/xserver-xorg-core.install: +- Simplify man page install + -- Timo Aaltonen tjaal...@debian.org Wed, 03 Jun 2015 11:41:03 +0300 xorg-server (2:1.17.2-1) unstable; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zi2p2-00036l...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/control |3
debian/patches/105_nvidia_fglrx_autodetect.patch| 27
debian/patches/111_armel-drv-fallbacks.patch| 13
debian/patches/122_xext_fix_card32_overflow_in_xauth.patch | 17
debian/patches/168_glibc_trace_to_stderr.patch | 14
debian/patches/188_default_primary_to_first_busid.patch |4
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 62
debian/patches/191-Xorg-add-an-extra-module-path.patch | 58
debian/patches/208_switch_on_release.diff | 18
debian/patches/226_fall_back_to_autoconfiguration.patch | 33
debian/patches/227_null_ptr_midispcur.patch | 15
debian/patches/232-xf86compatoutput-valgrind.patch | 17
debian/patches/config-add-no-removal.patch | 20
debian/patches/disable-rotation-transform-gpuscreens.patch |5
debian/patches/fix-detach-gpu.patch | 32
debian/patches/fix-ftbfs-ppc64el.patch |3
debian/patches/series |1
debian/patches/xf86-ignore-conflicting-rr-caps.patch| 12
debian/patches/xf86-inactive-gpuscreen.patch| 15
debian/patches/xfree86-no-xv-for-gpuscreens.patch | 24
debian/patches/xi2-resize-touch.patch |3
debian/patches/xmir-rootless.patch | 296
debian/patches/xmir.patch | 630
+++---
debian/rules|2
debian/xserver-xorg-core.install|8
25 files changed, 785 insertions(+), 547 deletions(-)
New commits:
commit b62f95454214b1d4a44bc8faa39b4cf341022323
Author: Robert Ancell robert.anc...@canonical.com
Date: Wed Jul 15 14:06:27 2015 +1200
Simplify man page install
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 6c06117..bf568df 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -1,13 +1,11 @@
main/usr/lib/xorg/modules usr/lib/xorg
main/usr/bin/Xorg usr/bin
main/usr/share/man/man1/Xorg.1 usr/share/man/man1
-main/usr/share/man/man4/exa.4 usr/share/man/man4
-main/usr/share/man/man4/fbdevhw.4 usr/share/man/man4
+main/usr/share/man/man4usr/share/man/
main/usr/share/man/man5/xorg.conf.5usr/share/man/man5
main/usr/share/man/man5/xorg.conf.d.5 usr/share/man/man5
main/usr/bin/cvt usr/bin
main/usr/bin/gtf usr/bin
main/usr/share/man/man1/cvt.1 usr/share/man/man1
main/usr/share/man/man1/gtf.1 usr/share/man/man1
-main/usr/share/man/man4/modesetting.4 usr/share/man/man4
main/usr/share/X11/xorg.conf.d usr/share/X11/
commit d85da0ee3b58fc457b375c698fb994378f03da05
Author: Robert Ancell robert.anc...@canonical.com
Date: Wed Jul 15 14:05:37 2015 +1200
Update XMir patches
diff --git a/debian/control b/debian/control
index b90b872..ca853b3 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Build-Depends:
libwayland-dev [linux-any],
# XMir
libmirclient-dev (= 0.13.1) [!arm64 !powerpc !ppc64el],
- libatomic-ops-dev,
+ mir-client-platform-mesa-dev,
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
@@ -211,6 +211,7 @@ Depends:
libpciaccess-dev,
mesa-common-dev,
libmirclient-dev [!arm64 !powerpc !ppc64el],
+ mir-client-platform-mesa-dev,
${misc:Depends},
Description: Xorg X server - development files
This package provides development files for the X.Org ('Xorg') X server.
diff --git a/debian/patches/series b/debian/patches/series
index ad76035..cf2fcbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,5 +47,6 @@ disable-rotation-transform-gpuscreens.patch
fix-ftbfs-ppc64el.patch
xmir.patch
+xmir-rootless.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
new file mode 100644
index 000..82b20b1
--- /dev/null
+++ b/debian/patches/xmir-rootless.patch
@@ -0,0 +1,296 @@
+From ae3f0599114144c26ab1de02320f000c86b2d042 Mon Sep 17 00:00:00 2001
+From: Robert Ancell robert.anc...@canonical.com
+Date: Thu, 9 Jul 2015 14:03:49 +1200
+Subject: [PATCH 2/3] xmir: Support rootless
+
+Contributions from:
+ Maarten Lankhorst maarten.lankho...@ubuntu.com
+ Robert Ancell robert.anc...@canonical.com
+---
+ composite/compalloc.c| 6 ++
+ composite/compositeext.h | 3 +++
+ hw/xmir/xmir-cursor.c| 5 -
+ hw/xmir/xmir-dri2.c | 4
+ hw/xmir/xmir-input.c | 34 ++
+ hw/xmir/xmir-output.c| 8
+ hw/xmir
