From 9a71910aef1a4cad2d3f50916689a6752fd07c5d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 15 Aug 2017 05:39:13 +0200 Subject: [PATCH 1/2] xorg-server: Add patch to handle SIGABRT Currently, when the X server receives the abort signal, no stack trace is logged [1]. The upstream master branch already contains a commit to fix this [2], so add that. Increment the revision. [1] https://lists.freedesktop.org/archives/amd-gfx/2017-August/012071.html [2] https://cgit.freedesktop.org/xorg/xserver/commit/?id=27a6b9f7c84c914d0f5909ec1069d72f5035bc04 --- xorg-server.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xorg-server.be0 b/xorg-server.be0 index b2946e37c..f9ec4a173 100755 --- a/xorg-server.be0 +++ b/xorg-server.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xorg-server-1.19.3-0 +# BEE_VERSION xorg-server-1.19.3-1 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -18,6 +18,7 @@ SRCURL[0]="https://ftp.x.org/pub/individual/xserver/xorg-server-${PKGVERSION}.ta # PATCHURL[0]="/src/mariux/download/xorg-xinerama.patch" PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/xorg-server-1.19.3-add_prime_support-1.patch) +PATCHURL+=(/src/mariux/patches/0001-os-Handle-SIGABRT.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From 7fdaa0e65cf8d1fe959e9db675cc784f5ca29b47 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 15 Aug 2017 06:09:16 +0200 Subject: [PATCH 2/2] xorg-server: Remove PRIME support patch causing asserts Applying the optional patch adding PRIME support causes the X server to hit an assert with integrated Intel graphics device and an AMD FirePro graphics card [1]. Removing the patch fixes the problem. Increment the revision. [1] https://bugs.freedesktop.org/show_bug.cgi?id=102222 --- xorg-server.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xorg-server.be0 b/xorg-server.be0 index f9ec4a173..077843a2d 100755 --- a/xorg-server.be0 +++ b/xorg-server.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xorg-server-1.19.3-1 +# BEE_VERSION xorg-server-1.19.3-2 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -17,7 +17,6 @@ SRCURL[0]="https://ftp.x.org/pub/individual/xserver/xorg-server-${PKGVERSION}.ta # PATCHURL[0]="/src/mariux/download/xorg-xinerama.patch" -PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/xorg-server-1.19.3-add_prime_support-1.patch) PATCHURL+=(/src/mariux/patches/0001-os-Handle-SIGABRT.patch) ###############################################################################