diff -u xorg-server-1.18.3/debian/changelog xorg-server-1.18.3/debian/changelog --- xorg-server-1.18.3/debian/changelog +++ xorg-server-1.18.3/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.18.3-1ubuntu7) yakkety; urgency=medium + + * fix_libreoffice_with_glamor.patch: + - glamor: Disable logic ops when doing compositing (LP: #1575000) + + -- Bryan Quigley Fri, 01 Jul 2016 11:03:45 -0400 + xorg-server (2:1.18.3-1ubuntu6) yakkety; urgency=medium * debian/patches/xmir.patch: diff -u xorg-server-1.18.3/debian/patches/series xorg-server-1.18.3/debian/patches/series --- xorg-server-1.18.3/debian/patches/series +++ xorg-server-1.18.3/debian/patches/series @@ -52,0 +53 @@ +fix_libreoffice_with_glamor.patch only in patch2: unchanged: --- xorg-server-1.18.3.orig/debian/patches/fix_libreoffice_with_glamor.patch +++ xorg-server-1.18.3/debian/patches/fix_libreoffice_with_glamor.patch @@ -0,0 +1,44 @@ +commit 743b6f231e999d8b2909228412266dc13cc433c5 +Author: Keith Packard +Date: Fri May 13 04:25:43 2016 -0700 + + glamor: Disable logic ops when doing compositing [v4] + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63397 + +Index: xorg-server-1.18.3/glamor/glamor_program.c +=================================================================== +--- xorg-server-1.18.3.orig/glamor/glamor_program.c ++++ xorg-server-1.18.3/glamor/glamor_program.c +@@ -445,6 +445,7 @@ static struct blendinfo composite_op_inf + static void + glamor_set_blend(CARD8 op, glamor_program_alpha alpha, PicturePtr dst) + { ++ glamor_screen_private *glamor_priv = glamor_get_screen_private(dst->pDrawable->pScreen); + GLenum src_blend, dst_blend; + struct blendinfo *op_info; + +@@ -459,6 +460,9 @@ glamor_set_blend(CARD8 op, glamor_progra + break; + } + ++ if (glamor_priv->gl_flavor != GLAMOR_GL_ES2) ++ glDisable(GL_COLOR_LOGIC_OP); ++ + if (op == PictOpSrc) + return; + +Index: xorg-server-1.18.3/glamor/glamor_render.c +=================================================================== +--- xorg-server-1.18.3.orig/glamor/glamor_render.c ++++ xorg-server-1.18.3/glamor/glamor_render.c +@@ -1084,6 +1084,9 @@ glamor_composite_set_shader_blend(glamor + } + } + ++ if (glamor_priv->gl_flavor != GLAMOR_GL_ES2) ++ glDisable(GL_COLOR_LOGIC_OP); ++ + if (op_info->source_blend == GL_ONE && op_info->dest_blend == GL_ZERO) { + glDisable(GL_BLEND); + }