From 4a25ea45c360a98c1f835f13b7505d0074079795a420ff79bcc29d6dda10ca2b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 6 Sep 2007 19:06:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=42 --- fbdevhw.diff | 12 ++++++++++++ xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 7 ++++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 fbdevhw.diff diff --git a/fbdevhw.diff b/fbdevhw.diff new file mode 100644 index 0000000..871f850 --- /dev/null +++ b/fbdevhw.diff @@ -0,0 +1,12 @@ +--- hw/xfree86/fbdevhw/fbdevhw.c.orig 2007-09-03 20:48:47.000000000 +0000 ++++ hw/xfree86/fbdevhw/fbdevhw.c 2007-09-03 20:53:12.000000000 +0000 +@@ -245,7 +245,8 @@ + set->green.length == req->green.length && + set->blue.length == req->blue.length && + set->xres == req->xres && set->yres == req->yres && +- set->pixclock == req->pixclock && ++ /* xenfb sets pixclock to 0 (Novell Bug #285523) */ ++ ((set->pixclock == req->pixclock) || !set->pixclock) && + set->right_margin == req->right_margin && + set->hsync_len == req->hsync_len && + set->left_margin == req->left_margin && diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index e97c5bb..954af33 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 3 23:08:42 CEST 2007 - sndirsch@suse.de + +- fbdevhw.diff: + * ignore pixclock set to 0 by Xen kernel (Bug #285523) + ------------------------------------------------------------------- Fri Aug 31 17:02:26 CEST 2007 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 0544a9a..424bb50 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 129 +Release: 131 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -99,6 +99,7 @@ Patch73: randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff Patch74: randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff Patch75: randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff Patch76: randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff +Patch77: fbdevhw.diff Patch334: p_pci-domain.diff Patch357: p_pci-ce-x.diff @@ -218,6 +219,7 @@ popd %patch74 -p1 %patch75 -p1 %patch76 -p1 +%patch77 %build pushd xorg-docs-* @@ -553,6 +555,9 @@ exit 0 %endif %changelog +* Mon Sep 03 2007 - sndirsch@suse.de +- fbdevhw.diff: + * ignore pixclock set to 0 by Xen kernel (Bug #285523) * Fri Aug 31 2007 - sndirsch@suse.de - added several RANDR 1.2 fixes (Bug #306699) * randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff