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
-
d1cce6cb
by Timo Aaltonen at 2018-06-13T11:10:47+03:00
-
2b925c8a
by Mike Hommey at 2018-06-21T07:03:26+09:00
-
f4c04453
by Timo Aaltonen at 2018-07-01T20:07:33+03:00
-
ea8c0b6d
by Timo Aaltonen at 2018-07-02T11:35:19+03:00
-
e5be771b
by Timo Aaltonen at 2018-07-02T11:37:10+03:00
5 changed files:
- − .gitlab-ci.yml
- debian/changelog
- debian/control
- + debian/patches/07_fix_glamor_fds_from_pixmap.diff
- debian/patches/series
Changes:
| 1 |
-image: docker:latest
|
|
| 2 |
-services:
|
|
| 3 |
- - docker:dind
|
|
| 4 |
- |
|
| 5 |
-before_script:
|
|
| 6 |
- - echo FROM nwnk/xserver-travis-rawhide:v5 > Dockerfile
|
|
| 7 |
- - echo ADD . /root >> Dockerfile
|
|
| 8 |
- - echo WORKDIR /root >> Dockerfile
|
|
| 9 |
- - docker build -t withgit .
|
|
| 10 |
- |
|
| 11 |
-job:
|
|
| 12 |
- script:
|
|
| 13 |
- - docker run --volume $HOME/.ccache:/root/.ccache withgit ./test/scripts/build-travis-deps.sh
|
| 1 |
+xorg-server (2:1.20.0-3ubuntu1) cosmic; urgency=medium
|
|
| 2 |
+ |
|
| 3 |
+ * Merge from Debian.
|
|
| 4 |
+ |
|
| 5 |
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 02 Jul 2018 11:36:12 +0300
|
|
| 6 |
+ |
|
| 7 |
+xorg-server (2:1.20.0-3) unstable; urgency=medium
|
|
| 8 |
+ |
|
| 9 |
+ [ Timo Aaltonen ]
|
|
| 10 |
+ * control: Add Breaks on libgl1-mesa-dri older than 18.0.5.
|
|
| 11 |
+ |
|
| 12 |
+ [ Mike Hommey ]
|
|
| 13 |
+ * 07_fix_glamor_fds_from_pixmap.diff: Apply 3da999a and 4d5950c from
|
|
| 14 |
+ upstream to fix an infinite loop in XWayland. Closes: #901883.
|
|
| 15 |
+ |
|
| 16 |
+ -- Timo Aaltonen <tjaalton@debian.org> Sun, 01 Jul 2018 20:07:24 +0300
|
|
| 17 |
+ |
|
| 1 | 18 |
xorg-server (2:1.20.0-2ubuntu1) cosmic; urgency=medium
|
| 2 | 19 |
|
| 3 | 20 |
* Merge from Debian unstable.
|
| ... | ... | @@ -104,6 +104,7 @@ Recommends: |
| 104 | 104 |
libpam-systemd,
|
| 105 | 105 |
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
|
| 106 | 106 |
Breaks:
|
| 107 |
+ libgl1-mesa-dri (<< 18.0.5),
|
|
| 107 | 108 |
xserver-xorg (<< 1:7.7+10~),
|
| 108 | 109 |
systemd (<< 226-4~),
|
| 109 | 110 |
Replaces:
|
| 1 |
+Description: Apply 3da999a and 4d5950c from upstream
|
|
| 2 |
+Author: Michel Dänzer <michel.daenzer@amd.com>
|
|
| 3 |
+ |
|
| 4 |
+Index: xorg-server/glamor/glamor.c
|
|
| 5 |
+===================================================================
|
|
| 6 |
+--- xorg-server.orig/glamor/glamor.c
|
|
| 7 |
++++ xorg-server/glamor/glamor.c
|
|
| 8 |
+@@ -828,20 +828,20 @@ glamor_fds_from_pixmap(ScreenPtr screen,
|
|
| 9 |
+ glamor_get_screen_private(pixmap->drawable.pScreen);
|
|
| 10 |
+
|
|
| 11 |
+ if (!glamor_priv->dri3_enabled)
|
|
| 12 |
+- return -1;
|
|
| 13 |
++ return 0;
|
|
| 14 |
+ switch (pixmap_priv->type) {
|
|
| 15 |
+ case GLAMOR_TEXTURE_DRM:
|
|
| 16 |
+ case GLAMOR_TEXTURE_ONLY:
|
|
| 17 |
+ if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
|
|
| 18 |
+ GL_RGB10_A2 : GL_RGBA, 0))
|
|
| 19 |
+- return -1;
|
|
| 20 |
++ return 0;
|
|
| 21 |
+ return glamor_egl_fds_from_pixmap(screen, pixmap, fds,
|
|
| 22 |
+ strides, offsets,
|
|
| 23 |
+ modifier);
|
|
| 24 |
+ default:
|
|
| 25 |
+ break;
|
|
| 26 |
+ }
|
|
| 27 |
+- return -1;
|
|
| 28 |
++ return 0;
|
|
| 29 |
+ }
|
|
| 30 |
+
|
|
| 31 |
+ _X_EXPORT int
|
|
| 32 |
+@@ -857,7 +857,7 @@ glamor_fd_from_pixmap(ScreenPtr screen,
|
|
| 33 |
+ &modifier);
|
|
| 34 |
+
|
|
| 35 |
+ /* Pixmaps with multi-planes/modifier are not supported in this interface */
|
|
| 36 |
+- if (ret > 1) {
|
|
| 37 |
++ if (ret != 1 || offsets[0] != 0) {
|
|
| 38 |
+ while (ret > 0)
|
|
| 39 |
+ close(fds[--ret]);
|
|
| 40 |
+ return -1;
|
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 |
03_static-nettle.diff
|
| 6 | 6 |
05_Revert-Unload-submodules.diff
|
| 7 | 7 |
06_use-intel-only-on-pre-gen4.diff
|
| 8 |
- |
|
| 8 |
+07_fix_glamor_fds_from_pixmap.diff
|
|
| 9 | 9 |
|
| 10 | 10 |
## Ubuntu patches, not upstreamable
|
| 11 | 11 |
168_glibc_trace_to_stderr.patch
|