Hello community, here is the log from the commit of package xorg-x11-server checked in at Wed Apr 9 22:04:28 CEST 2008. -------- --- xorg-x11-server/xorg-x11-server.changes 2008-04-07 17:55:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2008-04-09 20:14:00.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Apr 9 20:12:22 CEST 2008 - schwab@suse.de + +- Fix another o-b-1 in pci domain support. + +------------------------------------------------------------------- +Wed Apr 9 14:18:55 CEST 2008 - sndirsch@suse.de + +- randr1_1-sig11.diff + * fixes Xserver crash when running xrandr on a different virtual + terminal (Egbert Eich, bnc #223459) + +------------------------------------------------------------------- New: ---- randr1_1-sig11.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.M20335/_old 2008-04-09 22:03:28.000000000 +0200 +++ /var/tmp/diff_new_pack.M20335/_new 2008-04-09 22:03:28.000000000 +0200 @@ -22,7 +22,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 86 +Release: 88 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -111,6 +111,7 @@ Patch103: confine_to_shape.diff Patch104: bitmap_always_unscaled.diff Patch105: commit-37b1258.diff +Patch106: randr1_1-sig11.diff %description This package contains the X.Org Server. @@ -251,6 +252,7 @@ %patch103 %patch104 -p1 %patch105 -p1 +%patch106 -p1 %build pushd xorg-docs-* @@ -557,6 +559,12 @@ %endif %changelog +* Wed Apr 09 2008 schwab@suse.de +- Fix another o-b-1 in pci domain support. +* Wed Apr 09 2008 sndirsch@suse.de +- randr1_1-sig11.diff + * fixes Xserver crash when running xrandr on a different virtual + terminal (Egbert Eich, bnc #223459) * Mon Apr 07 2008 sndirsch@suse.de - commit-37b1258.diff * possibly fixes unwanted autorepeat (bnc #377612, bfo #14811) ++++++ p_pci-off-by-one.diff.ia64 ++++++ --- /var/tmp/diff_new_pack.M20335/_old 2008-04-09 22:03:31.000000000 +0200 +++ /var/tmp/diff_new_pack.M20335/_new 2008-04-09 22:03:31.000000000 +0200 @@ -1,7 +1,11 @@ ---- hw/xfree86/os-support/bus/linuxPci.c.orig 2007-08-23 21:04:53.000000000 +0200 -+++ hw/xfree86/os-support/bus/linuxPci.c 2007-10-03 13:31:32.647167750 +0200 -@@ -547,7 +547,7 @@ xf86GetPciDomain(PCITAG Tag) - return result + 1; +--- hw/xfree86/os-support/bus/linuxPci.c ++++ hw/xfree86/os-support/bus/linuxPci.c +@@ -547,10 +547,10 @@ xf86GetPciDomain(PCITAG Tag) + pPCI = xf86GetPciHostConfigFromTag(Tag); + + if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum))) +- return result + 1; ++ return result; if (!pPCI || pPCI->fakeDevice) - return 1; /* Domain 0 is reserved */ @@ -9,7 +13,7 @@ if ((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0) return 0; -@@ -555,7 +555,7 @@ xf86GetPciDomain(PCITAG Tag) +@@ -558,7 +558,7 @@ xf86GetPciDomain(PCITAG Tag) if ((result = ioctl(fd, PCIIOC_CONTROLLER, 0)) < 0) return 0; @@ -18,7 +22,7 @@ } static pointer -@@ -626,7 +626,7 @@ linuxMapPci(int ScreenNum, int Flags, PC +@@ -629,7 +629,7 @@ linuxMapPci(int ScreenNum, int Flags, PC return NULL; } @@ -27,7 +31,7 @@ static pointer DomainMmappedIO[MAX_DOMAINS]; static int -@@ -647,11 +647,10 @@ linuxOpenLegacy(PCITAG Tag, char *name) +@@ -650,11 +650,10 @@ linuxOpenLegacy(PCITAG Tag, char *name) domain = xf86GetPciDomain(Tag); bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag)); @@ -41,7 +45,7 @@ fd = open(path, O_RDWR); if (fd >= 0) { xfree(path); -@@ -683,7 +682,6 @@ _X_EXPORT pointer +@@ -686,7 +685,6 @@ _X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, unsigned long Size) { @@ -49,7 +53,7 @@ int fd = -1; pointer addr; -@@ -731,7 +729,7 @@ xf86MapDomainIO(int ScreenNum, int Flags +@@ -734,7 +732,7 @@ xf86MapDomainIO(int ScreenNum, int Flags int domain = xf86GetPciDomain(Tag); int fd; ++++++ randr1_1-sig11.diff ++++++ diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 4432ad9..7e446de 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -223,6 +223,9 @@ xf86RandRSetConfig (ScreenPtr pScreen, Bool useVirtual = FALSE; Rotation oldRotation = randrp->rotation; + if (!scrp->vtSema) + return FALSE; + miPointerPosition (&px, &py); for (mode = scrp->modes; ; mode = mode->next) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de