Andreas Boll pushed to branch debian-stretch at X Strike Force / xserver / xorg-server
Commits: 40d524fa by Andreas Boll at 2018-10-31T16:58:53Z 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! - - - - - 3 changed files: - debian/changelog - + debian/patches/12_glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch - debian/patches/series Changes: ===================================== 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 <[email protected]> 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. ===================================== 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 <[email protected]> +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 <[email protected]> + Signed-off-by: Tapani Pälli <[email protected]> + 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; ===================================== debian/patches/series ===================================== @@ -10,3 +10,4 @@ 09_Xi-Do-not-try-to-swap-GenericEvent.patch 10_Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch 11_xfree86-Disable-logfile-and-modulepath.patch +12_glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/commit/40d524fa05eeac0f3d432622121c47b577d7f80c -- View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/commit/40d524fa05eeac0f3d432622121c47b577d7f80c You're receiving this email because of your account on salsa.debian.org.
