xorg-server: Changes to 'ubuntu-xenial'

[Robert Ancell]

New branch 'ubuntu-xenial' available with the following commits:
commit 242ec8b9121e7a4fbbed596c38b4d4f7612f202e
Author: Robert Ancell 
Date:   Fri Apr 29 16:07:25 2016 +0200

release to xenial

xorg-server: Changes to 'ubuntu'

[Robert Ancell]

 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 
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   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 
-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_priv->base.fbo->tex);
-+   glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->fbo->tex);
- 
- if (glamor_priv->gl_flavor ==