[arch-commits] Commit in xorg-server/trunk (4 files)
Andreas Radke
andyrtr at archlinux.org
Sun Jun 10 09:48:08 UTC 2018
Date: Sunday, June 10, 2018 @ 09:48:07
Author: andyrtr
Revision: 326609
upgpkg: xorg-server 1.20.0-7
add upstream patch for FS#i58662 to prevent crashes
Added:
xorg-server/trunk/0002-fix-libshadow-2.patch
(from rev 326608, xorg-server/trunk/0001-fix-libshadow-2.patch)
xorg-server/trunk/0003_Use_PictureMatchFormat_for_source-only_picture_format.diff
Modified:
xorg-server/trunk/PKGBUILD
Deleted:
xorg-server/trunk/0001-fix-libshadow-2.patch
-----------------------------------------------------------------+
0001-fix-libshadow-2.patch | 24 -------
0002-fix-libshadow-2.patch | 24 +++++++
0003_Use_PictureMatchFormat_for_source-only_picture_format.diff | 34 ++++++++++
PKGBUILD | 11 ++-
4 files changed, 66 insertions(+), 27 deletions(-)
Deleted: 0001-fix-libshadow-2.patch
===================================================================
--- 0001-fix-libshadow-2.patch 2018-06-10 07:16:15 UTC (rev 326608)
+++ 0001-fix-libshadow-2.patch 2018-06-10 09:48:07 UTC (rev 326609)
@@ -1,24 +0,0 @@
-From 9ed4ae9cf207360000742c09007a32ad144b52db Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker at gmail.com>
-Date: Fri, 25 May 2018 20:17:35 +0200
-Subject: [PATCH] fix libshadow
-
----
- hw/xfree86/dixmods/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..6bd8029b6 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -38,6 +38,7 @@ shared_module(
-
- install: true,
- install_dir: module_dir,
-+ install_rpath: '$ORIGIN/./',
- )
-
- if build_glx
---
-2.17.0
-
Copied: xorg-server/trunk/0002-fix-libshadow-2.patch (from rev 326608, xorg-server/trunk/0001-fix-libshadow-2.patch)
===================================================================
--- 0002-fix-libshadow-2.patch (rev 0)
+++ 0002-fix-libshadow-2.patch 2018-06-10 09:48:07 UTC (rev 326609)
@@ -0,0 +1,24 @@
+From 9ed4ae9cf207360000742c09007a32ad144b52db Mon Sep 17 00:00:00 2001
+From: fafryd <dz1125.bug.tracker at gmail.com>
+Date: Fri, 25 May 2018 20:17:35 +0200
+Subject: [PATCH] fix libshadow
+
+---
+ hw/xfree86/dixmods/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d23215..6bd8029b6 100644
+--- a/hw/xfree86/dixmods/meson.build
++++ b/hw/xfree86/dixmods/meson.build
+@@ -38,6 +38,7 @@ shared_module(
+
+ install: true,
+ install_dir: module_dir,
++ install_rpath: '$ORIGIN/./',
+ )
+
+ if build_glx
+--
+2.17.0
+
Added: 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff
===================================================================
--- 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff (rev 0)
+++ 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff 2018-06-10 09:48:07 UTC (rev 326609)
@@ -0,0 +1,34 @@
+From 3ebef6ab850675e1091df2125ebdfbb147436e6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer at amd.com>
+Date: Fri, 1 Jun 2018 11:57:15 +0200
+Subject: exa: Use PictureMatchFormat for source-only picture format
+ description
+
+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 at 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);
+
+--
+cgit v1.1
+
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-10 07:16:15 UTC (rev 326608)
+++ PKGBUILD 2018-06-10 09:48:07 UTC (rev 326609)
@@ -6,7 +6,7 @@
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest'
'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
pkgver=1.20.0
-pkgrel=6
+pkgrel=7
arch=('x86_64')
license=('custom')
groups=('xorg')
@@ -21,7 +21,8 @@
'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0'
xserver-autobind-hotplug.patch
0001-v2-FS-58644.patch
- 0001-fix-libshadow-2.patch
+ 0002-fix-libshadow-2.patch
+ 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff
xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
xvfb-run # with updates from FC master
@@ -36,6 +37,7 @@
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
'74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
'0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271'
+ 'afe5c58d86089f02d4f3b7d0e6912cd3d75a17522b40e9cd7d4c69611740174884de3455940c6a565ffaad0f4e7e4f7ebeab72b79e8c6ef15da57418fbedcf0d'
'a8f65ca23ae52865147bdc1bc059b1265ba4bc61527992cf054fe76a0396ef5dfd2386782be371e926184a63def3be7333bb37fc429627d4e6fa159d263f40f7'
'fc259a0a4acb7b70209fc599b0f4bc94942316bbc8c6995f783026b7cd455900bcb7527615d76c99bd2e0155e0035cbd619939a1f7ddf3af32ed854afe45b631'
'55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
@@ -61,7 +63,10 @@
# Fix libshadow.so: libfb.so => not found - FS#58731
# https://bugs.freedesktop.org/show_bug.cgi?id=106656
- patch -Np1 -i ../0001-fix-libshadow-2.patch
+ patch -Np1 -i ../0002-fix-libshadow-2.patch
+
+ # FS#i58662
+ patch -Np1 -i ../0003_Use_PictureMatchFormat_for_source-only_picture_format.diff
}
build() {
More information about the arch-commits
mailing list