Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Control: block 908601 by -1 Hi, I'd like to backport an upstream xorg-server patch to stable to fix issue #908601. It fixes a kwin regression caused by Mesa >= 18.0. This issue has already been fixed in xorg-server in unstable and testing. However with backporting Mesa to stretch-backports this issue has also been triggered with xorg-server in stretch. Since we don't backport xorg-server to stretch-backports and the required patch for stretch is very small I'd like to fix this issue via stretch-pu. Attached is the debdiff between xorg-server 2:1.19.2-1+deb9u4 and 2:1.19.2-1+deb9u5. Thanks, Andreas
diff -u xorg-server-1.19.2/debian/changelog xorg-server-1.19.2/debian/changelog --- xorg-server-1.19.2/debian/changelog +++ xorg-server-1.19.2/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.19.2-1+deb9u5) stretch; urgency=medium + + * Cherry-pick c2954b16c (glx: do not pick sRGB config for 32-bit RGBA + visual) from upstream. Fixes various blending issues with kwin and + Mesa >= 18.0 (i.e. Mesa from stretch-backports) (Closes: #908601). + Thanks to Nicholas D Steeves and Robert Trebula for testing! + + -- Andreas Boll <ab...@debian.org> Wed, 31 Oct 2018 17:58:03 +0100 + xorg-server (2:1.19.2-1+deb9u4) stretch-security; urgency=medium * Disable -logfile and -modulepath when running with elevated privileges. diff -u xorg-server-1.19.2/debian/patches/series xorg-server-1.19.2/debian/patches/series --- xorg-server-1.19.2/debian/patches/series +++ xorg-server-1.19.2/debian/patches/series @@ -12,0 +13 @@ +12_glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch only in patch2: unchanged: --- xorg-server-1.19.2.orig/debian/patches/12_glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch +++ xorg-server-1.19.2/debian/patches/12_glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch @@ -0,0 +1,31 @@ +commit c2954b16c8730c7ed8441fd8dba25900f3aed265 +Author: Tapani Pälli <tapani.pa...@intel.com> +Date: Tue Nov 28 09:23:29 2017 +0200 + + glx: do not pick sRGB config for 32-bit RGBA visual + + This fixes blending issues seen with kwin and gnome-shell when + 32bit visual has sRGB capability set. + + Reviewed-by: Adam Jackson <a...@redhat.com> + Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699 + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646 + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655 + +diff --git a/glx/glxscreens.c b/glx/glxscreens.c +index 73444152a..596d972e0 100644 +--- a/glx/glxscreens.c ++++ b/glx/glxscreens.c +@@ -271,6 +271,11 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual) + /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */ + if (visual->nplanes == 32 && config->rgbBits != 32) + continue; ++ /* If it's the 32-bit RGBA visual, do not pick sRGB capable config. ++ * This can cause issues with compositors that are not sRGB aware. ++ */ ++ if (visual->nplanes == 32 && config->sRGBCapable == GL_TRUE) ++ continue; + /* Can't use the same FBconfig for multiple X visuals. I think. */ + if (config->visualID != 0) + continue;
