From 5868f75da585d2c311b8f1c7bd577d4806c7ee4b9c2d36f81970eff1fe118782 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 9 Apr 2008 20:04:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=72 --- p_pci-off-by-one.diff.ia64 | 22 +++++++++++++--------- randr1_1-sig11.diff | 14 ++++++++++++++ xorg-x11-server.changes | 12 ++++++++++++ xorg-x11-server.spec | 10 +++++++++- 4 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 randr1_1-sig11.diff diff --git a/p_pci-off-by-one.diff.ia64 b/p_pci-off-by-one.diff.ia64 index 2808c9b..e78ae91 100644 --- a/p_pci-off-by-one.diff.ia64 +++ b/p_pci-off-by-one.diff.ia64 @@ -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; diff --git a/randr1_1-sig11.diff b/randr1_1-sig11.diff new file mode 100644 index 0000000..180ff49 --- /dev/null +++ b/randr1_1-sig11.diff @@ -0,0 +1,14 @@ +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) + { diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 24aa8ba..e9bb012 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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) + ------------------------------------------------------------------- Mon Apr 7 18:13:06 CEST 2008 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 88220f5..b70c9f9 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -22,7 +22,7 @@ BuildRequires: libjpeg-devel 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 @@ Patch102: xorg-server-1.4-vnc-memory.diff 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 @@ popd %patch103 %patch104 -p1 %patch105 -p1 +%patch106 -p1 %build pushd xorg-docs-* @@ -557,6 +559,12 @@ exit 0 %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)