rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=72

Browse Source
This commit is contained in:
OBS User unknown 2008-04-09 20:04:32 +00:00 committed by Git OBS Bridge
parent c488541237
commit 5868f75da5
4 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
p_pci-off-by-one.diff.ia64
View File

@ -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
+++ hw/xfree86/os-support/bus/linuxPci.c 2007-10-03 13:31:32.647167750 +0200 +++ hw/xfree86/os-support/bus/linuxPci.c
@@ -547,7 +547,7 @@ xf86GetPciDomain(PCITAG Tag) @@ -547,10 +547,10 @@ xf86GetPciDomain(PCITAG Tag)
return result + 1; pPCI = xf86GetPciHostConfigFromTag(Tag);
if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum)))
- return result + 1;
+ return result;
if (!pPCI || pPCI->fakeDevice) if (!pPCI || pPCI->fakeDevice)
- return 1; /* Domain 0 is reserved */ - return 1; /* Domain 0 is reserved */
@ -9,7 +13,7 @@
if ((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0) if ((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0)
return 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) if ((result = ioctl(fd, PCIIOC_CONTROLLER, 0)) < 0)
return 0; return 0;
@ -18,7 +22,7 @@
} }
static pointer static pointer
@@ -626,7 +626,7 @@ linuxMapPci(int ScreenNum, int Flags, PC @@ -629,7 +629,7 @@ linuxMapPci(int ScreenNum, int Flags, PC
return NULL; return NULL;
} }
@ -27,7 +31,7 @@
static pointer DomainMmappedIO[MAX_DOMAINS]; static pointer DomainMmappedIO[MAX_DOMAINS];
static int static int
@@ -647,11 +647,10 @@ linuxOpenLegacy(PCITAG Tag, char *name) @@ -650,11 +650,10 @@ linuxOpenLegacy(PCITAG Tag, char *name)
domain = xf86GetPciDomain(Tag); domain = xf86GetPciDomain(Tag);
bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag)); bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag));
@ -41,7 +45,7 @@
fd = open(path, O_RDWR); fd = open(path, O_RDWR);
if (fd >= 0) { if (fd >= 0) {
xfree(path); xfree(path);
@@ -683,7 +682,6 @@ _X_EXPORT pointer @@ -686,7 +685,6 @@ _X_EXPORT pointer
xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag,
ADDRESS Base, unsigned long Size) ADDRESS Base, unsigned long Size)
{ {
@ -49,7 +53,7 @@
int fd = -1; int fd = -1;
pointer addr; 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 domain = xf86GetPciDomain(Tag);
int fd; int fd;

14
randr1_1-sig11.diff Normal file
View File

@ -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)
{

12
xorg-x11-server.changes
View File

@ -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 Mon Apr 7 18:13:06 CEST 2008 - sndirsch@suse.de

10
xorg-x11-server.spec
View File

@ -22,7 +22,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.3 Version: 7.3
Release: 86 Release: 88
License: X11/MIT License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -111,6 +111,7 @@ Patch102: xorg-server-1.4-vnc-memory.diff
Patch103: confine_to_shape.diff Patch103: confine_to_shape.diff
Patch104: bitmap_always_unscaled.diff Patch104: bitmap_always_unscaled.diff
Patch105: commit-37b1258.diff Patch105: commit-37b1258.diff
Patch106: randr1_1-sig11.diff
%description %description
This package contains the X.Org Server. This package contains the X.Org Server.
@ -251,6 +252,7 @@ popd
%patch103 %patch103
%patch104 -p1 %patch104 -p1
%patch105 -p1 %patch105 -p1
%patch106 -p1
%build %build
pushd xorg-docs-* pushd xorg-docs-*
@ -557,6 +559,12 @@ exit 0
%endif %endif
%changelog %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 * Mon Apr 07 2008 sndirsch@suse.de
- commit-37b1258.diff - commit-37b1258.diff
* possibly fixes unwanted autorepeat (bnc #377612, bfo #14811) * possibly fixes unwanted autorepeat (bnc #377612, bfo #14811)