debian/changelog | 6 + debian/patches/glamor-factor-out-glamor-set-color.diff | 58 ++++++++++ debian/patches/glamor-source-pictures-are-always-depth-32.diff | 30 +++++ debian/patches/series | 3 4 files changed, 97 insertions(+)
New commits: commit cbcc49baa97d1645dd088e7cef68bf65a2f2288a Author: Timo Aaltonen <[email protected]> Date: Fri Mar 11 09:39:20 2016 +0200 release to xenial diff --git a/debian/changelog b/debian/changelog index 27228e8..483eda7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xorg-server (2:1.18.1-1ubuntu4) UNRELEASED; urgency=medium +xorg-server (2:1.18.1-1ubuntu4) xenial; urgency=medium * glamor: Fix font rendering issue. (LP: #1555960) - -- Timo Aaltonen <[email protected]> Fri, 11 Mar 2016 08:20:50 +0200 + -- Timo Aaltonen <[email protected]> Fri, 11 Mar 2016 09:36:40 +0200 xorg-server (2:1.18.1-1ubuntu3) xenial; urgency=medium commit da266b5c3a94a9c942dc8676f65743128503567f Author: Timo Aaltonen <[email protected]> Date: Fri Mar 11 09:36:21 2016 +0200 glamor: Fix font rendering issue. (LP: #1555960) diff --git a/debian/changelog b/debian/changelog index 18cd204..27228e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.18.1-1ubuntu4) UNRELEASED; urgency=medium + + * glamor: Fix font rendering issue. (LP: #1555960) + + -- Timo Aaltonen <[email protected]> Fri, 11 Mar 2016 08:20:50 +0200 + xorg-server (2:1.18.1-1ubuntu3) xenial; urgency=medium * Merge xmir changes from 2:1.17.3-2ubuntu4. diff --git a/debian/patches/glamor-factor-out-glamor-set-color.diff b/debian/patches/glamor-factor-out-glamor-set-color.diff new file mode 100644 index 0000000..b799d3d --- /dev/null +++ b/debian/patches/glamor-factor-out-glamor-set-color.diff @@ -0,0 +1,58 @@ +commit b05ae79ee3bebef9790c97eedc033d1ffb3ec39a +Author: Michel Dänzer <[email protected]> +Date: Tue Feb 23 17:19:02 2016 +0900 + + glamor: Factor out glamor_set_color_depth from glamor_set_color + + The former takes explicit screen and depth parameters instead of + deriving them from a pixmap. + + Reviewed-by: Adam Jackson <[email protected]> + Signed-off-by: Michel Dänzer <[email protected]> + +--- a/glamor/glamor_transform.c ++++ b/glamor/glamor_transform.c +@@ -107,15 +107,16 @@ glamor_set_destination_drawable(Drawable + */ + + void +-glamor_set_color(PixmapPtr pixmap, +- CARD32 pixel, +- GLint uniform) ++glamor_set_color_depth(ScreenPtr pScreen, ++ int depth, ++ CARD32 pixel, ++ GLint uniform) + { + float color[4]; + + glamor_get_rgba_from_pixel(pixel, + &color[0], &color[1], &color[2], &color[3], +- format_for_pixmap(pixmap)); ++ format_for_depth(depth)); + + glUniform4fv(uniform, 1, color); + } +--- a/glamor/glamor_transform.h ++++ b/glamor/glamor_transform.h +@@ -34,9 +34,19 @@ glamor_set_destination_drawable(Drawable + int *p_off_y); + + void ++glamor_set_color_depth(ScreenPtr pScreen, ++ int depth, ++ CARD32 pixel, ++ GLint uniform); ++ ++static inline void + glamor_set_color(PixmapPtr pixmap, + CARD32 pixel, +- GLint uniform); ++ GLint uniform) ++{ ++ glamor_set_color_depth(pixmap->drawable.pScreen, ++ pixmap->drawable.depth, pixel, uniform); ++} + + Bool + glamor_set_texture_pixmap(PixmapPtr texture); diff --git a/debian/patches/glamor-source-pictures-are-always-depth-32.diff b/debian/patches/glamor-source-pictures-are-always-depth-32.diff new file mode 100644 index 0000000..d64fa84 --- /dev/null +++ b/debian/patches/glamor-source-pictures-are-always-depth-32.diff @@ -0,0 +1,30 @@ +commit a3e681eafa5355b8bb3b099d47983f14f0d5e197 +Author: Michel Dänzer <[email protected]> +Date: Tue Feb 23 17:19:03 2016 +0900 + + glamor: Source pictures are always depth 32 + + We were using the destination pixmap depth to determine the source + picture format. + + Fixes incorrect text rendering with some MATE desktop GTK3 themes. + + Reviewed-by: Adam Jackson <[email protected]> + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94246 + Signed-off-by: Michel Dänzer <[email protected]> + +--- a/glamor/glamor_program.c ++++ b/glamor/glamor_program.c +@@ -491,9 +491,9 @@ use_source_solid(CARD8 op, PicturePtr sr + + glamor_set_blend(op, prog->alpha, dst); + +- glamor_set_color(glamor_get_drawable_pixmap(dst->pDrawable), +- src->pSourcePict->solidFill.color, +- prog->fg_uniform); ++ glamor_set_color_depth(dst->pDrawable->pScreen, 32, ++ src->pSourcePict->solidFill.color, ++ prog->fg_uniform); + return TRUE; + } + diff --git a/debian/patches/series b/debian/patches/series index 6ee13f3..f177018 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -51,3 +51,6 @@ drm_device_keep_trying.patch xi2-resize-touch.patch xmir-fixes.diff fix-xineramaqueryscreens-for-reverse-prime.diff + +glamor-factor-out-glamor-set-color.diff +glamor-source-pictures-are-always-depth-32.diff
