diff --git a/.gitignore b/.gitignore index f3ef7c0..91ec1b3 100644 --- a/.gitignore +++ b/.gitignore @@ -129,3 +129,4 @@ mutter-2.31.5.tar.bz2 /mutter-3.25.4.tar.xz /mutter-3.25.90.tar.xz /mutter-3.25.91.tar.xz +/mutter-3.25.92.tar.xz diff --git a/0001-wayland-dma-buf-Fix-32bpp-channel-order-inversion.patch b/0001-wayland-dma-buf-Fix-32bpp-channel-order-inversion.patch deleted file mode 100644 index 93093a8..0000000 --- a/0001-wayland-dma-buf-Fix-32bpp-channel-order-inversion.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 51f867457faf8cf660080e64c148a8470af26e45 Mon Sep 17 00:00:00 2001 -From: Daniel Stone -Date: Thu, 24 Aug 2017 10:14:31 +0100 -Subject: [PATCH] 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 -Signed-off-by: Daniel Stone ---- - 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 93bf32beb..e5d2f7c35 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; --- -2.13.5 - diff --git a/mutter.spec b/mutter.spec index 411c0f6..d8b71fe 100644 --- a/mutter.spec +++ b/mutter.spec @@ -5,8 +5,8 @@ %global libinput_version 1.4 Name: mutter -Version: 3.25.91 -Release: 2%{?dist} +Version: 3.25.92 +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -16,7 +16,6 @@ Source0: http://download.gnome.org/sources/%{name}/3.25/%{name}-%{version} Patch0: startup-notification.patch # https://bugzilla.gnome.org/show_bug.cgi?id=786677 -Patch1: 0001-wayland-dma-buf-Fix-32bpp-channel-order-inversion.patch BuildRequires: chrpath BuildRequires: pango-devel @@ -185,6 +184,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/mutter/tests %changelog +* Thu Sep 07 2017 Florian Müllner - 3.25.92-1 +- Update to 3.25.92 + * Thu Aug 24 2017 Bastien Nocera - 3.25.91-2 + mutter-3.25.91-2 - Fix inverted red and blue channels with newer Mesa diff --git a/sources b/sources index 4160b5a..5fe3e47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutter-3.25.91.tar.xz) = ba09d3419fd87a191d615d18fe6236c4467009b7f2d3a0929508a0b6ed4b0cd7eb864ca654419e4c1ba7fd680de2f4306c0188f63b65e6fb96f662d69ace26fb +SHA512 (mutter-3.25.92.tar.xz) = e4ed6b062aa9207518718c43e135499fb987e9969c102fa1a62aca480854f0f000ff5c763a2d0b50d937e35792b87668a7fd37ac0c68236d054d27c5624460e7