Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Thu Apr 12 23:22:48 CEST 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-04-03 17:55:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-04-12 20:44:20.236466000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 12 20:43:12 CEST 2007 - sndirsch@suse.de + +- bug-263199_radeon-mergedfb-crash.diff: + * fixed MergedFB related Xserver crash (Bug #263199) + +------------------------------------------------------------------- New: ---- bug-263199_radeon-mergedfb-crash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.f13762/_old 2007-04-12 23:22:33.000000000 +0200 +++ /var/tmp/diff_new_pack.f13762/_new 2007-04-12 23:22:33.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 76 +Release: 78 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -89,6 +89,7 @@ Patch29: xf86-video-nv.randr12.diff Patch30: xf86-video-mga.randr12.diff Patch31: xf86-video-ati-6.6.191.diff +Patch32: bug-263199_radeon-mergedfb-crash.diff %description This package contains X.Org video drivers. @@ -117,6 +118,7 @@ %patch18 -p1 %patch27 -p0 %patch31 -p0 +%patch32 -p2 popd pushd xf86-video-nv-*/src %patch3 -p6 @@ -262,6 +264,9 @@ %{_mandir}/man4/* %changelog +* Thu Apr 12 2007 - sndirsch@suse.de +- bug-263199_radeon-mergedfb-crash.diff: + * fixed MergedFB related Xserver crash (Bug #263199) * Tue Apr 03 2007 - sndirsch@suse.de - updated "nvrandr12" driver to current git: * G80: Get HW cursor working with RandR 1.2 ++++++ bug-263199_radeon-mergedfb-crash.diff ++++++ diff --git a/src/radeon_driver.c b/src/radeon_driver.c index c4bda8a..0f9e2d6 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2328,7 +2328,11 @@ static Bool RADEONPreInitModes(ScrnInfoP } } + else + info->MergedFB = FALSE; } + else + info->MergedFB = FALSE; if (info->MergedFB) { /* If no virtual dimension was given by the user, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org