xorg-server: update to 21.1.4.

This commit is contained in:
Leah Neukirchen 2022-07-15 15:23:09 +02:00
parent da1b31e960
commit 8a99188dd2
2 changed files with 3 additions and 45 deletions

View file

@ -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

View file

@ -1,7 +1,7 @@
# Template file for 'xorg-server' # Template file for 'xorg-server'
pkgname=xorg-server pkgname=xorg-server
version=21.1.3 version=21.1.4
revision=3 revision=1
build_style=meson build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb -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" license="MIT, BSD-3-Clause"
homepage="https://xorg.freedesktop.org" homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
checksum=61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5 checksum=5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587
lib32disabled=yes lib32disabled=yes
provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
xserver-abi-video-25_1 xf86-video-modesetting-1_1" xserver-abi-video-25_1 xf86-video-modesetting-1_1"