rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

Accepting request 1137260 from X11:XOrg

Browse Source 
- n_xserver-optimus-autoconfig-hack.patch
  u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
  u_xfree86-activate-GPU-screens-on-autobind.patch
  * check dixPrivateKeyRegistered(rrPrivKey) before calling
    rrGetScrPriv() to avoid xserver crash when Xinerama is enabled
    (boo#1218240)
 -------------------------------------------------------------------

OBS-URL: https://build.opensuse.org/request/show/1137260
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=422
This commit is contained in:
Dominique Leuenberger 2024-01-07 20:39:07 +00:00 committed by Git OBS Bridge
commit b0f021b69e
5 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
n_xserver-optimus-autoconfig-hack.patch
View File

@ -62,7 +62,7 @@ Index: xorg-server-1.20.5/hw/xfree86/common/xf86Init.c
#include "picturestr.h"
#include "randrstr.h"
#include "glxvndabi.h"
@@ -294,6 +295,231 @@ AddVTAtoms(CallbackListPtr *pcbl, void *
@@ -294,6 +295,237 @@ AddVTAtoms(CallbackListPtr *pcbl, void *
"Failed to register VT properties\n");
}
@ -92,6 +92,9 @@ Index: xorg-server-1.20.5/hw/xfree86/common/xf86Init.c
+ } *outputConfigs;
+ int outputConfigsCount = 0, outputConfigsUsed = 0;
+
+ if (!dixPrivateKeyRegistered(rrPrivKey))
+ return;
+
+ pMasterScrPriv = rrGetScrPriv(pMasterScreen);
+ if (!pMasterScrPriv)
+ return;
@ -253,6 +256,9 @@ Index: xorg-server-1.20.5/hw/xfree86/common/xf86Init.c
+ rrScrPrivPtr master_rp;
+ rrScrPrivPtr slave_rp;
+
+ if (!dixPrivateKeyRegistered(rrPrivKey))
+ return;
+
+ master_rp = rrGetScrPriv(master);
+ slave_rp = rrGetScrPriv(slave);
+

6
u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
View File

@ -25,9 +25,13 @@ Index: xorg-server-21.1.0/randr/randr.c
===================================================================
--- xorg-server-21.1.0.orig/randr/randr.c
+++ xorg-server-21.1.0/randr/randr.c
@@ -651,7 +651,9 @@ RRTellChanged(ScreenPtr pScreen)
@@ -650,8 +650,13 @@ RRTellChanged(ScreenPtr pScreen)
pScrPriv->crtcs[i]->changed = FALSE;
xorg_list_for_each_entry(iter, &primary->secondary_list, secondary_head) {
+ if (!dixPrivateKeyRegistered(rrPrivKey)) {
+ break;
+ }
pSecondaryScrPriv = rrGetScrPriv(iter);
- pSecondaryScrPriv->provider->changed = FALSE;
+ if (pSecondaryScrPriv->provider) {

5
u_xfree86-activate-GPU-screens-on-autobind.patch
View File

@ -59,7 +59,7 @@ index 380288ca4..9839cb19c 100644
}
static void
@@ -258,6 +263,186 @@ AddVTAtoms(CallbackListPtr *pcbl, void *data, void *screen)
@@ -258,6 +263,189 @@ AddVTAtoms(CallbackListPtr *pcbl, void *data, void *screen)
"Failed to register VT properties\n");
}
@ -90,6 +90,9 @@ index 380288ca4..9839cb19c 100644
+ } *outputConfigs;
+ int outputConfigsCount = 0, outputConfigsUsed = 0;
+
+ if (!dixPrivateKeyRegistered(rrPrivKey))
+ return;
+
+ pMasterScrPriv = rrGetScrPriv(pMasterScreen);
+ if (!pMasterScrPriv)
+ return;

10
xorg-x11-server.changes
View File

@ -1,4 +1,14 @@
-------------------------------------------------------------------
Sat Jan 6 15:12:29 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- n_xserver-optimus-autoconfig-hack.patch
u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
u_xfree86-activate-GPU-screens-on-autobind.patch
* check dixPrivateKeyRegistered(rrPrivKey) before calling
rrGetScrPriv() to avoid xserver crash when Xinerama is enabled
(boo#1218240)
-------------------------------------------------------------------
Mon Dec 4 18:49:47 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
- U_bsc1217765-Xi-allocate-enough-XkbActions-for-our-buttons.patch

2
xorg-x11-server.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-server
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed