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

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

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
 

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