r53228 - in /desktop/experimental/mutter/debian: changelog patches/git_fix-wayland-color-inversion.patch patches/series patches/skip-failing-tests-325.patch

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Thu Aug 31 11:11:25 2017
New Revision: 53228

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53228
Log:
Copy 2 patches from Ubuntu

Added:
    desktop/experimental/mutter/debian/patches/git_fix-wayland-color-inversion.patch
    desktop/experimental/mutter/debian/patches/skip-failing-tests-325.patch
Modified:
    desktop/experimental/mutter/debian/changelog
    desktop/experimental/mutter/debian/patches/series

Modified: desktop/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/changelog?rev=53228&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog	[utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog	[utf-8] Thu Aug 31 11:11:25 2017
@@ -1,6 +1,11 @@
 mutter (3.25.91-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Add skip-failing-tests-325.patch:
+    - Skip one more test that started failing with 3.25
+  * Add git_fix-wayland-color-inversion.patch:
+    - Cherry-pick patch to fix wrong colors in clutter apps on Wayland
+      (LP: #1712986)
 
  -- Jeremy Bicha <jbicha at debian.org>  Thu, 31 Aug 2017 07:09:05 -0400
 

Added: desktop/experimental/mutter/debian/patches/git_fix-wayland-color-inversion.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/git_fix-wayland-color-inversion.patch?rev=53228&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/git_fix-wayland-color-inversion.patch	(added)
+++ desktop/experimental/mutter/debian/patches/git_fix-wayland-color-inversion.patch	[utf-8] Thu Aug 31 11:11:25 2017
@@ -0,0 +1,45 @@
+From 06d09890147b48bfa23f122ff86cf7fc43ff84f2 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniels at collabora.com>
+Date: Thu, 24 Aug 2017 10:14:31 +0100
+Subject: wayland-dma-buf: Fix 32bpp channel order inversion
+
+Apparently my understanding of Cogl pixel formats, or at least their
+use, was somewhat shaky.
+
+Un-invert the inversion of the DRM FourCC -> Cogl pixel format mapping
+when creating dmabufs from clients, fixing inverted channel ordering
+seen from GL clients, e.g. gold highlights in gtk4-demo when using the
+GSK GL backend when they should be blue.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786677
+---
+ src/wayland/meta-wayland-dma-buf.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c
+index 93bf32b..e5d2f7c 100644
+--- a/src/wayland/meta-wayland-dma-buf.c
++++ b/src/wayland/meta-wayland-dma-buf.c
+@@ -83,16 +83,13 @@ meta_wayland_dma_buf_buffer_attach (MetaWaylandBuffer *buffer,
+   if (buffer->texture)
+     return TRUE;
+ 
+-  /* DRM_FORMAT_* enums consider the entire pixel as a single packed quantity,
+-   * with little-endian ordering. COGL_PIXEL_FORMAT_* is in byte order when
+-   * each channel is an 8-byte unit. Hence these have order swapped. */
+   switch (dma_buf->drm_format)
+     {
+     case DRM_FORMAT_XRGB8888:
+-      cogl_format = COGL_PIXEL_FORMAT_BGR_888;
++      cogl_format = COGL_PIXEL_FORMAT_RGB_888;
+       break;
+     case DRM_FORMAT_ARGB8888:
+-      cogl_format = COGL_PIXEL_FORMAT_BGRA_8888_PRE;
++      cogl_format = COGL_PIXEL_FORMAT_ARGB_8888_PRE;
+       break;
+     case DRM_FORMAT_ARGB2101010:
+       cogl_format = COGL_PIXEL_FORMAT_ARGB_2101010_PRE;
+-- 
+cgit v0.12
+
+

Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=53228&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series	[utf-8] Thu Aug 31 11:11:25 2017
@@ -1,2 +1,4 @@
 bgo768531_workaround-startup-notifications.patch
 skip-failing-tests.patch
+skip-failing-tests-325.patch
+git_fix-wayland-color-inversion.patch

Added: desktop/experimental/mutter/debian/patches/skip-failing-tests-325.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/skip-failing-tests-325.patch?rev=53228&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/skip-failing-tests-325.patch	(added)
+++ desktop/experimental/mutter/debian/patches/skip-failing-tests-325.patch	[utf-8] Thu Aug 31 11:11:25 2017
@@ -0,0 +1,18 @@
+Description: Skip test that started failing with 3.25
+ That way we can still benefit by running all the other tests.
+Author: Jeremy Bicha <jbicha at ubuntu.com>
+Bug: https://bugzilla.gnome.org/785319
+---
+ clutter/tests/conform/Makefile.am |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/clutter/tests/conform/Makefile.am
++++ b/clutter/tests/conform/Makefile.am
+@@ -26,7 +26,6 @@ actor_tests = \
+ 	actor-layout \
+ 	actor-meta \
+ 	actor-offscreen-limit-max-size \
+-	actor-offscreen-redirect \
+ 	actor-paint-opacity \
+ 	actor-size \
+ 	$(NULL)