.gitlab-ci.yml

-image: docker:latest
-services:
-    - docker:dind
-
-before_script:
-    - echo FROM nwnk/xserver-travis-rawhide:v5 > Dockerfile
-    - echo ADD . /root >> Dockerfile
-    - echo WORKDIR /root >> Dockerfile
-    - docker build -t withgit .
-
-job:
-    script:
-        - docker run --volume $HOME/.ccache:/root/.ccache withgit ./test/scripts/build-travis-deps.sh

debian/changelog

+xorg-server (2:1.20.0-3ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 02 Jul 2018 11:36:12 +0300
+
+xorg-server (2:1.20.0-3) unstable; urgency=medium
+
+  [ Timo Aaltonen ]
+  * control: Add Breaks on libgl1-mesa-dri older than 18.0.5.
+
+  [ Mike Hommey ]
+  * 07_fix_glamor_fds_from_pixmap.diff: Apply 3da999a and 4d5950c from
+    upstream to fix an infinite loop in XWayland. Closes: #901883.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Sun, 01 Jul 2018 20:07:24 +0300
+
 xorg-server (2:1.20.0-2ubuntu1) cosmic; urgency=medium
 
   * Merge from Debian unstable.

debian/control

@@ -104,6 +104,7 @@ Recommends:
  libpam-systemd,
 Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
 Breaks:
+ libgl1-mesa-dri (<< 18.0.5),
  xserver-xorg (<< 1:7.7+10~),
  systemd (<< 226-4~),
 Replaces:

debian/patches/07_fix_glamor_fds_from_pixmap.diff

+Description: Apply 3da999a and 4d5950c from upstream
+Author: Michel Dänzer <michel.daenzer@amd.com>
+
+Index: xorg-server/glamor/glamor.c
+===================================================================
+--- xorg-server.orig/glamor/glamor.c
++++ xorg-server/glamor/glamor.c
+@@ -828,20 +828,20 @@ glamor_fds_from_pixmap(ScreenPtr screen,
+         glamor_get_screen_private(pixmap->drawable.pScreen);
+ 
+     if (!glamor_priv->dri3_enabled)
+-        return -1;
++        return 0;
+     switch (pixmap_priv->type) {
+     case GLAMOR_TEXTURE_DRM:
+     case GLAMOR_TEXTURE_ONLY:
+         if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
+                                       GL_RGB10_A2 : GL_RGBA, 0))
+-            return -1;
++            return 0;
+         return glamor_egl_fds_from_pixmap(screen, pixmap, fds,
+                                           strides, offsets,
+                                           modifier);
+     default:
+         break;
+     }
+-    return -1;
++    return 0;
+ }
+ 
+ _X_EXPORT int
+@@ -857,7 +857,7 @@ glamor_fd_from_pixmap(ScreenPtr screen,
+                                  &modifier);
+ 
+     /* Pixmaps with multi-planes/modifier are not supported in this interface */
+-    if (ret > 1) {
++    if (ret != 1 || offsets[0] != 0) {
+         while (ret > 0)
+             close(fds[--ret]);
+         return -1;

debian/patches/series

@@ -5,7 +5,7 @@
 03_static-nettle.diff
 05_Revert-Unload-submodules.diff
 06_use-intel-only-on-pre-gen4.diff
-
+07_fix_glamor_fds_from_pixmap.diff
 
 ## Ubuntu patches, not upstreamable
 168_glibc_trace_to_stderr.patch