From 0fa3951d01256c6c8a1fde20ea3f79394ffa54f02ecb0bb6ed60abbda2e4bfaa Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 7 Jan 2014 16:02:42 +0000 Subject: [PATCH 1/2] - changed license back to MIT, since xf4nc is no longer patched into X.Org sources (bnc#856905) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=492 --- xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 96f9af0..ce56cd5 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 7 16:02:22 UTC 2014 - sndirsch@suse.com + +- changed license back to MIT, since xf4nc is no longer patched + into X.Org sources (bnc#856905) + ------------------------------------------------------------------- Wed Jan 1 05:35:47 UTC 2014 - crrodriguez@opensuse.org diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index d158855..4aff58d 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,7 +21,7 @@ Name: xorg-x11-server %define dirsuffix 1.15.0 Summary: X -License: GPL-2.0+ and MIT +License: MIT Group: System/X11/Servers/XF86_4 Source0: xorg-server-%{dirsuffix}.tar.bz2 Source1: sysconfig.displaymanager.template From b9e33120dabd0f9bd3ea8b980c84a265654e2ea60667c7a9ecbd745b95578d80 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 16 Jan 2014 09:47:08 +0000 Subject: [PATCH 2/2] Accepting request 214078 from home:sndirsch:branches:X11:XOrg - removed N_randr_fix_abi.patch, since it caused the crash with current NVIDIA drivers built against xorg-server 1.15 (bnc#858827) OBS-URL: https://build.opensuse.org/request/show/214078 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=493 --- N_randr_fix_abi.patch | 26 -------------------------- xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 2 -- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 N_randr_fix_abi.patch diff --git a/N_randr_fix_abi.patch b/N_randr_fix_abi.patch deleted file mode 100644 index 3b78ae4..0000000 --- a/N_randr_fix_abi.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Michal Srb - -Fix compatibility with nvidia binary drivers - -(bnc#849152) - -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 ce56cd5..be3099a 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 15 13:39:58 UTC 2014 - sndirsch@suse.com + +- removed N_randr_fix_abi.patch, since it caused the crash with + current NVIDIA drivers built against xorg-server 1.15 (bnc#858827) + ------------------------------------------------------------------- Tue Jan 7 16:02:22 UTC 2014 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 4aff58d..f5cd5f3 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -118,7 +118,6 @@ Patch1: N_default-module-path.diff Patch2: N_zap_warning_xserver.diff Patch3: N_driver-autoconfig.diff Patch4: N_fix_fglrx_screendepth_issue.patch -Patch5: N_randr_fix_abi.patch Patch6: N_fix-dpi-values.diff Patch100: u_fbdevhw.diff @@ -193,7 +192,6 @@ cp %{SOURCE90} . %patch2 -p1 %patch3 -p0 %patch4 -p0 -%patch5 -p1 %patch6 -p0 %patch100