Accepting request 625923 from home:jdelvare:branches:X11:XOrg

- U_exa-use-picturematchformat.patch
  * Fix breakage of Xfce (bsc#1102979)

OBS-URL: https://build.opensuse.org/request/show/625923
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=714

U_exa-use-picturematchformat.patch

@@ -0,0 +1,30 @@
+From 3ebef6ab850675e1091df2125ebdfbb147436e6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
+Date: Fri, 1 Jun 2018 11:57:15 +0200
+Subject: exa: Use PictureMatchFormat for source-only picture format description
+References: bsc#1102979
+
+Their pFormat member is NULL, which resulted in a crash in
+miRenderColorToPixel.
+
+Fixes: 8171d4c2d67b "render: Store and use all 16bpc of precision for
+                     solid pixels (v2.1)"
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+ exa/exa_render.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/exa/exa_render.c b/exa/exa_render.c
+index 50a9a65..9fbfdfc 100644
+--- a/exa/exa_render.c
++++ b/exa/exa_render.c
+@@ -291,7 +291,8 @@ exaTryDriverSolidFill(PicturePtr pSrc,
+         pixel = exaGetPixmapFirstPixel(pSrcPix);
+     }
+     else
+-        miRenderColorToPixel(pSrc->pFormat,
++        miRenderColorToPixel(PictureMatchFormat(pDst->pDrawable->pScreen, 32,
++                                                pSrc->format),
+                              &pSrc->pSourcePict->solidFill.fullcolor,
+                              &pixel);
+ 

xorg-x11-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jul 28 11:24:05 UTC 2018 - jdelvare@suse.de
+
+- U_exa-use-picturematchformat.patch
+  * Fix breakage of Xfce (bsc#1102979)
+
 -------------------------------------------------------------------
 Wed Jul 25 09:25:28 UTC 2018 - sndirsch@suse.com
 

xorg-x11-server.spec

@@ -230,6 +230,8 @@ Patch1501:      U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch
 Patch1600:      U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch
 Patch1601:      u_modesetting-Fix-cirrus-24bpp-breakage.patch
 
+Patch1700:      U_exa-use-picturematchformat.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -375,6 +377,8 @@ sh %{SOURCE92} --verify . %{SOURCE91}
 %patch1600 -p1
 %patch1601 -p1
 
+%patch1700 -p1
+
 %build
 test -e source-file-list || \
     find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \