From e39402d64419f0de425ab826e56fd6e0b238f337 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sun, 30 Aug 2020 10:23:54 +0300
Subject: [PATCH] xorg-server: 1.20.9

---
 xorg/xorg-server/build                   |  1 +
 xorg/xorg-server/checksums               |  1 +
 xorg/xorg-server/patches/fix-crash.patch | 31 ++++++++++++++++++++++++
 xorg/xorg-server/sources                 |  1 +
 xorg/xorg-server/version                 |  2 +-
 5 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 xorg/xorg-server/patches/fix-crash.patch

diff --git a/xorg/xorg-server/build b/xorg/xorg-server/build
index 159e34fc..1618331b 100755
--- a/xorg/xorg-server/build
+++ b/xorg/xorg-server/build
@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
 patch -p1 < rootless_modesetting.patch
+patch -p1 < fix-crash.patch
 
 ./configure \
     --prefix=/usr \
diff --git a/xorg/xorg-server/checksums b/xorg/xorg-server/checksums
index e45b4f81..8bc4a67e 100644
--- a/xorg/xorg-server/checksums
+++ b/xorg/xorg-server/checksums
@@ -1,2 +1,3 @@
 e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571
 c98ad9376f20ab25463ef74bb19f2dbe874a19918b27b430c8e632d272379129
+e5a501146cf71407aca777f569a9e65c32256a5f3642dbe9852b4bd1a9ae8dbe
diff --git a/xorg/xorg-server/patches/fix-crash.patch b/xorg/xorg-server/patches/fix-crash.patch
new file mode 100644
index 00000000..e15b0c55
--- /dev/null
+++ b/xorg/xorg-server/patches/fix-crash.patch
@@ -0,0 +1,31 @@
+From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Fri, 26 Oct 2018 17:47:30 -0700
+Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system
+ with PCI.
+
+Some Broadcom set-top-box boards have PCI busses, but the GPU is still
+probed through DT.  We would dereference a null busid here in that
+case.
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+---
+ hw/xfree86/common/xf86platformBus.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
+index cef47da03d..dadbac6c8f 100644
+--- a/hw/xfree86/common/xf86platformBus.c
++++ b/hw/xfree86/common/xf86platformBus.c
+@@ -289,7 +289,7 @@ xf86platformProbe(void)
+     for (i = 0; i < xf86_num_platform_devices; i++) {
+         char *busid = xf86_platform_odev_attributes(i)->busid;
+
+-        if (pci && (strncmp(busid, "pci:", 4) == 0)) {
++        if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
+             platform_find_pci_info(&xf86_platform_devices[i], busid);
+         }
+
+--
+GitLab
+
diff --git a/xorg/xorg-server/sources b/xorg/xorg-server/sources
index a48eb87c..3349a572 100644
--- a/xorg/xorg-server/sources
+++ b/xorg/xorg-server/sources
@@ -1,2 +1,3 @@
 https://x.org/releases/individual/xserver/xorg-server-1.20.9.tar.bz2
 patches/rootless_modesetting.patch
+patches/fix-crash.patch
diff --git a/xorg/xorg-server/version b/xorg/xorg-server/version
index 7bfc78a7..1b5b476a 100644
--- a/xorg/xorg-server/version
+++ b/xorg/xorg-server/version
@@ -1 +1 @@
-1.20.9 1
+1.20.9 2