Hello community, here is the log from the commit of package xorg-x11 checked in at Fri Jun 30 01:11:49 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-06-28 12:04:19.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-06-29 22:51:26.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 29 22:51:24 CEST 2006 - sndirsch@suse.de + +- p_ia64-console.diff: + * fixes MCA after start of second Xserver (Bug #177011) + +------------------------------------------------------------------- New: ---- p_ia64-console.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.RnOfTv/_old 2006-06-30 01:10:25.000000000 +0200 +++ /var/tmp/diff_new_pack.RnOfTv/_new 2006-06-30 01:10:25.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 65 +Release: 66 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -127,6 +127,7 @@ Patch369: libXfont-X11R7.0-1.0.0-no-ft-internals.patch Patch370: x11r6.9.0-setuid.diff Patch371: p_initialize-pci-tag.diff +Patch372: p_ia64-console.diff Patch400: p_bug96328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1573,6 +1574,9 @@ pushd programs/Xserver/hw/xfree86/os-support/linux/int10 %patch371 popd +pushd programs/Xserver/hw/xfree86/os-support +%patch372 +popd # UTS_RELEASE=`uname -r` UTS_MAJOR=${UTS_RELEASE%%%%.*} @@ -2730,6 +2734,9 @@ %clean %changelog -n xorg-x11 +* Thu Jun 29 2006 - sndirsch@suse.de +- p_ia64-console.diff: + * fixes MCA after start of second Xserver (Bug #177011) * Wed Jun 28 2006 - sndirsch@suse.de - p_initialize-pci-tag.diff: * initialize PCI tag correctly, which is used by an IA64 specific ++++++ FILES ++++++ --- xorg-x11/FILES 2006-06-28 12:05:33.000000000 +0200 +++ xorg-x11/FILES 2006-06-29 22:51:13.000000000 +0200 @@ -187,3 +187,5 @@ fglrx driver - and possibly other drivers like vesa - during initial startup (!), VT switch and startup of second Xserver (SLED10 Blocker Bugs #180535, #170991, #158806) +p_ia64-console.diff: +- fixes MCA after start of second Xserver (Bug #177011) ++++++ p_ia64-console.diff ++++++ Index: linux/lnx_init.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v retrieving revision 1.9 diff -u -r1.9 lnx_init.c --- linux/lnx_init.c 26 Aug 2005 07:35:55 -0000 1.9 +++ linux/lnx_init.c 29 Jun 2006 09:33:05 -0000 @@ -243,9 +243,6 @@ if (!ShareVTs) { -#if defined(DO_OS_FONTRESTORE) - lnx_savefont(); -#endif /* * now get the VT */ @@ -256,7 +253,9 @@ if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0) xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed: %s\n", strerror(errno)); - +#if defined(DO_OS_FONTRESTORE) + lnx_savefont(); +#endif if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", strerror(errno)); @@ -345,6 +344,11 @@ if (VTSwitch) { +#if defined(DO_OS_FONTRESTORE) + if (xf86Info.vtno == vtno) /* check if we are active */ + lnx_restorefont(); + lnx_freefontdata(); +#endif /* * Perform a switch back to the active VT when we were started */ @@ -355,11 +359,6 @@ activeVT = -1; } -#if defined(DO_OS_FONTRESTORE) - if (xf86Info.vtno == vtno) /* check if we are active */ - lnx_restorefont(); - lnx_freefontdata(); -#endif } close(xf86Info.consoleFd); /* make the vt-manager happy */ Index: shared/VTsw_usl.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v retrieving revision 1.5 diff -u -r1.5 VTsw_usl.c --- shared/VTsw_usl.c 3 Jul 2005 07:01:35 -0000 1.5 +++ shared/VTsw_usl.c 29 Jun 2006 09:33:05 -0000 @@ -64,15 +64,15 @@ xf86VTSwitchAway() { xf86Info.vtRequestsPending = FALSE; +#ifdef OSSWITCHAWAY + OSSWITCHAWAY; +#endif if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0) { return(FALSE); } else { -#ifdef OSSWITCHAWAY - OSSWITCHAWAY; -#endif return(TRUE); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org