Timo Aaltonen pushed to branch ubuntu at X Strike Force / xserver / xorg-server
Commits:
990ddd07 by Timo Aaltonen at 2018-06-13T11:04:43+03:00
remove upstream .gitlab-ci.yml, it makes no sense on salsa
- - - - -
d1cce6cb by Timo Aaltonen at 2018-06-13T11:10:47+03:00
control: Add Breaks on libgl1-mesa-dri older than 18.0.5.
- - - - -
2b925c8a by Mike Hommey at 2018-06-21T07:03:26+09:00
Apply 3da999a and 4d5950c from upstream to fix an infinite loop in XWayland
- - - - -
f4c04453 by Timo Aaltonen at 2018-07-01T20:07:33+03:00
release to sid
- - - - -
ea8c0b6d by Timo Aaltonen at 2018-07-02T11:35:19+03:00
Merge branch 'debian-unstable' into ubuntu
- - - - -
e5be771b by Timo Aaltonen at 2018-07-02T11:37:10+03:00
release to cosmic
- - - - -
5 changed files:
- − .gitlab-ci.yml
- debian/changelog
- debian/control
- + debian/patches/07_fix_glamor_fds_from_pixmap.diff
- debian/patches/series
Changes:
=====================================
.gitlab-ci.yml deleted
=====================================
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-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
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+xorg-server (2:1.20.0-3ubuntu1) cosmic; urgency=medium
+
+ * Merge from Debian.
+
+ -- Timo Aaltonen <tjaal...@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 <tjaal...@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
=====================================
--- a/debian/control
+++ b/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
=====================================
--- /dev/null
+++ b/debian/patches/07_fix_glamor_fds_from_pixmap.diff
@@ -0,0 +1,40 @@
+Description: Apply 3da999a and 4d5950c from upstream
+Author: Michel Dänzer <michel.daen...@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
=====================================
--- a/debian/patches/series
+++ b/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
View it on GitLab:
https://salsa.debian.org/xorg-team/xserver/xorg-server/compare/3773ab0fb2ae37a6e0939781feb70bd23aef253e...e5be771b983e88e5ea71ae997f73be9163b35a98
--
View it on GitLab:
https://salsa.debian.org/xorg-team/xserver/xorg-server/compare/3773ab0fb2ae37a6e0939781feb70bd23aef253e...e5be771b983e88e5ea71ae997f73be9163b35a98
You're receiving this email because of your account on salsa.debian.org.
