From d02ce72bd69acca74372dca7d376cc0de3df3732e6c0a9419ffc4ff997d4aa24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 5 Nov 2013 08:40:55 +0000 Subject: [PATCH 1/2] Accepting request 205546 from home:michalsrb:branches:X11:XOrg - N_randr_fix_abi.patch * Fixes compatibility with nvidia binary drivers. OBS-URL: https://build.opensuse.org/request/show/205546 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=466 --- N_randr_fix_abi.patch | 20 ++++++++++++++++++++ xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 N_randr_fix_abi.patch diff --git a/N_randr_fix_abi.patch b/N_randr_fix_abi.patch new file mode 100644 index 0000000..22b1491 --- /dev/null +++ b/N_randr_fix_abi.patch @@ -0,0 +1,20 @@ +diff --git a/randr/randrstr.h b/randr/randrstr.h +index 15299fd..03ed146 100644 +--- a/randr/randrstr.h ++++ b/randr/randrstr.h +@@ -301,7 +301,6 @@ typedef struct _rrScrPriv { + Bool changed; /* some config changed */ + Bool configChanged; /* configuration changed */ + Bool layoutChanged; /* screen layout changed */ +- Bool resourcesChanged; /* screen resources change */ + + CARD16 minWidth, minHeight; + CARD16 maxWidth, maxHeight; +@@ -338,6 +337,7 @@ typedef struct _rrScrPriv { + + RRProviderDestroyProcPtr rrProviderDestroy; + ++ Bool resourcesChanged; /* screen resources change */ + } rrScrPrivRec, *rrScrPrivPtr; + + extern _X_EXPORT DevPrivateKeyRec rrPrivKeyRec; diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 83d089a..80ab400 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 1 13:46:06 UTC 2013 - msrb@suse.com + +- N_randr_fix_abi.patch + * Fixes compatibility with nvidia binary drivers. + ------------------------------------------------------------------- Mon Oct 28 08:00:16 UTC 2013 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index ff42ad3..2bab1ac 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -163,6 +163,7 @@ Patch244: u_randr_send_rrproviderchangenotify_event.patch Patch245: u_randr_send_rrresourcechangenotify_event.patch Patch246: u_randr_deliver_output_and_crtc_events_of_attached_output.patch Patch247: u_randr_allow_rrselectinput_for_providerchange_and_resourcechange_events.patch +Patch248: N_randr_fix_abi.patch %description This package contains the X.Org Server. @@ -255,6 +256,7 @@ cp %{SOURCE96} . %patch245 -p1 %patch246 -p1 %patch247 -p1 +%patch248 -p1 %build autoreconf -fi From 1ffe4a28c4d955a6be334144115e52552a256c3fc7ba87908a185fd07c955a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 6 Nov 2013 09:28:40 +0000 Subject: [PATCH 2/2] Just add bnc number for compat reasons. * Fixes compatibility with nvidia binary drivers. (bnc#849152) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=467 --- xorg-x11-server.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 80ab400..d8dec25 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -2,7 +2,7 @@ Fri Nov 1 13:46:06 UTC 2013 - msrb@suse.com - N_randr_fix_abi.patch - * Fixes compatibility with nvidia binary drivers. + * Fixes compatibility with nvidia binary drivers. (bnc#849152) ------------------------------------------------------------------- Mon Oct 28 08:00:16 UTC 2013 - sndirsch@suse.com