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

Accepting request 611149 from home:michalsrb:branches:X11:XOrg

Browse Source 
- Remove n_add-dummy-xf86DisableRandR.patch
  * After upgrade to 1.20.0 the API officially no longer includes
    xf86DisableRandR, so there is no need to add it back.

OBS-URL: https://build.opensuse.org/request/show/611149
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=704
This commit is contained in:
Stefan Dirsch 2018-05-22 09:41:11 +00:00 committed by Git OBS Bridge
parent d6176188d0
commit ba153cf191
3 changed files with 7 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
n_add-dummy-xf86DisableRandR.patch
View File

@ -1,52 +0,0 @@
Subject: Add dummy xf86DisableRandR.
Patch-mainline: Never
Author: Michal Srb <msrb@suse.com>
References: bnc#1089601
This is temporary fix for breakage after backporting upstream patch
dd00e5466a0e4ea313d1860824da4123692827ed (xorg-server-1.19.0-566-gdd00e5466).
The patch removed function xf86DisableRandR. This patch re-adds it as a dummy function
that does nothing to fix linking with drivers that expect it. Drivers should no longer
call it, so putting it back empty has the same effect.
Index: xorg-server-1.19.6/hw/xfree86/common/xf86.h
===================================================================
--- xorg-server-1.19.6.orig/hw/xfree86/common/xf86.h
+++ xorg-server-1.19.6/hw/xfree86/common/xf86.h
@@ -319,6 +319,10 @@ extern _X_EXPORT Bool
xf86GetModInDevEnabled(void);
extern _X_EXPORT Bool
xf86GetAllowMouseOpenFail(void);
+// Warning: This function does nothing now.
+// See: https://bugzilla.opensuse.org/show_bug.cgi?id=1089601
+extern _X_EXPORT void
+xf86DisableRandR(void);
extern _X_EXPORT CARD32
xorgGetVersion(void);
extern _X_EXPORT CARD32
Index: xorg-server-1.19.6/hw/xfree86/common/xf86Helper.c
===================================================================
--- xorg-server-1.19.6.orig/hw/xfree86/common/xf86Helper.c
+++ xorg-server-1.19.6/hw/xfree86/common/xf86Helper.c
@@ -1572,6 +1572,21 @@ xf86GetAllowMouseOpenFail(void)
return xf86Info.allowMouseOpenFail;
}
+void
+xf86DisableRandR(void)
+{
+ // Do nothing!
+
+ // This function was re-added to fix linking problems with drivers that expect it.
+ // For example nvidia. See: https://bugzilla.opensuse.org/show_bug.cgi?id=1089601
+
+ // This function was used to disable RANDR 1.1 if the driver intended to initialize
+ // RANDR 1.2+ itself. Since patch dd00e5466a0e4ea313d1860824da4123692827ed ("xfree86:
+ // Remove broken RANDR disabling logic") this is no longer necessary. X server will
+ // only initialize RANDR 1.1 if no driver initialized any other RANDR. So the result
+ // is the same even with this function doing nothing.
+}
+
CARD32
xf86GetModuleVersion(void *module)
{

7
xorg-x11-server.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 22 07:47:26 UTC 2018 - msrb@suse.com
- Remove n_add-dummy-xf86DisableRandR.patch
* After upgrade to 1.20.0 the API officially no longer includes
xf86DisableRandR, so there is no need to add it back.
-------------------------------------------------------------------
Sat May 12 15:03:54 UTC 2018 - tobias.johannes.klausmann@mni.thm.de

2
xorg-x11-server.spec
View File

@ -222,7 +222,6 @@ Patch1211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patc
Patch1222: b_sync-fix.patch
Patch1401: u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
Patch1402: n_add-dummy-xf86DisableRandR.patch
%description
This package contains the X.Org Server.
@ -362,7 +361,6 @@ sh %{SOURCE92} --verify . %{SOURCE91}
#%patch1222 -p1
%patch1401 -p1
%patch1402 -p1
%build
test -e source-file-list || \