[PR PATCH] xorg-server: fix MATE crash with nvidia

[PR PATCH] xorg-server: fix MATE crash with nvidia

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1368 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages mate-xorg-fix
https://github.com/void-linux/void-packages/pull/35414

xorg-server: fix MATE crash with nvidia
see:
- https://github.com/mate-desktop/mate-desktop/issues/505
- https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35414.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mate-xorg-fix-35414.patch --]
[-- Type: text/x-diff, Size: 2692 bytes --]

From 7e98b3f68f7a5754ac110d869599b24f32511581 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Fri, 4 Feb 2022 23:04:39 -0500
Subject: [PATCH] xorg-server: fix MATE crash with nvidia

see: https://github.com/mate-desktop/mate-desktop/issues/505
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
---
 ...sent-Check-for-NULL-to-prevent-crash.patch | 43 +++++++++++++++++++
 srcpkgs/xorg-server/template                  |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create 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
new file mode 100644
index 000000000000..894ad0eb1d47
--- /dev/null
+++ b/srcpkgs/xorg-server/patches/present-Check-for-NULL-to-prevent-crash.patch
@@ -0,0 +1,43 @@
+From 94b4a3d45451d29e9539ea234ce8b5e9ed58546c 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 xserver] 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>
+(cherry picked from commit 22d5818851967408bb7c903cb345b7ca8766094c)
+---
+ present/present_scmd.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/present/present_scmd.c b/present/present_scmd.c
+index 3c68e690b..11391adbb 100644
+--- a/present/present_scmd.c
++++ b/present/present_scmd.c
+@@ -168,6 +168,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);
+ }
+ 
+@@ -206,6 +209,9 @@ present_flush(WindowPtr window)
+     if (!screen_priv->info)
+         return;
+ 
++    if (!screen_priv->info->flush)
++        return;
++
+     (*screen_priv->info->flush) (window);
+ }
+ 
+-- 
+2.34.1
+
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index e48d679b0360..38b40bfae005 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.14
-revision=1
+revision=2
 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

Re: [PR PATCH] [Merged]: xorg-server: fix MATE crash with nvidia

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1201 bytes --]

There's a merged pull request on the void-packages repository

xorg-server: fix MATE crash with nvidia
https://github.com/void-linux/void-packages/pull/35414

Description:
see:
- https://github.com/mate-desktop/mate-desktop/issues/505
- https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->