From 8a99188dd2d2c55d8a630f0d262468569c3a18a2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Jul 2022 15:23:09 +0200
Subject: [PATCH] xorg-server: update to 21.1.4.

---
 ...sent-Check-for-NULL-to-prevent-crash.patch | 42 -------------------
 srcpkgs/xorg-server/template                  |  6 +--
 2 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/xorg-server/patches/present-Check-for-NULL-to-prevent-crash.patch

diff --git a/srcpkgs/xorg-server/patches/present-Check-for-NULL-to-prevent-crash.patch b/srcpkgs/xorg-server/patches/present-Check-for-NULL-to-prevent-crash.patch
deleted file mode 100644
index ca02e648db3..00000000000
--- a/srcpkgs/xorg-server/patches/present-Check-for-NULL-to-prevent-crash.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 22d5818851967408bb7c903cb345b7ca8766094c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
-Date: Thu, 13 Jan 2022 00:47:27 +0100
-Subject: [PATCH] present: Check for NULL to prevent crash
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
-Signed-off-by: Błażej Szczygieł <spaz16@wp.pl>
-Tested-by: Aaron Plattner <aplattner@nvidia.com>
----
- present/present_scmd.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/present/present_scmd.c b/present/present_scmd.c
-index da836ea6b..239055bc1 100644
---- a/present/present_scmd.c
-+++ b/present/present_scmd.c
-@@ -158,6 +158,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
-     if (!screen_priv->info)
-         return NULL;
- 
-+    if (!screen_priv->info->get_crtc)
-+        return NULL;
-+
-     return (*screen_priv->info->get_crtc)(window);
- }
- 
-@@ -196,6 +199,9 @@ present_flush(WindowPtr window)
-     if (!screen_priv->info)
-         return;
- 
-+    if (!screen_priv->info->flush)
-+        return;
-+
-     (*screen_priv->info->flush) (window);
- }
- 
--- 
-GitLab
-
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 171f39e4149..c77881daf0a 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=21.1.3
-revision=3
+version=21.1.4
+revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -24,7 +24,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5
+checksum=5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-25_1 xf86-video-modesetting-1_1"