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

p_pci-domain.diff

@@ -1,11 +0,0 @@
---- hw/xfree86/os-support/bus/xf86Pci.h.p_pci-domain.diff	2006-11-13 19:59:23.000000000 +0100
-+++ hw/xfree86/os-support/bus/xf86Pci.h	2006-11-14 05:39:22.000000000 +0100
-@@ -767,6 +767,8 @@
- ADDRESS	      pciHostAddrToBusAddr(PCITAG tag, PciAddrType type, ADDRESS addr);
- PCITAG	      pciTag(int busnum, int devnum, int funcnum);
- PCITAG	      pciDomTag(int domnum, int busnum, int devnum, int funcnum);
-+void	      pciInfoFromTag(PCITAG tag, int *domainnum,
-+				int *busnum, int *devnum, int *funcnum);
- int	      pciGetBaseSize(PCITAG tag, int indx, Bool destructive, Bool *min);
- CARD32	      pciCheckForBrokenBase(PCITAG tag,int basereg);
- pointer	      xf86MapPciMem(int ScreenNum, int Flags, PCITAG Tag,

xorg-x11-server.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct  3 19:08:19 CEST 2007 - sndirsch@suse.de
+
+- removed obsolete patch p_pci-domain.diff (Bug #308693, comment #26)
+- apply p_pci-off-by-one.diff.ia64 on all platforms since it clearly
+  only affects platforms, where INCLUDE_XF86_NO_DOMAIN is *not* set;
+  this still not explains why we have seen Xserver hangups with the
+  patch in place on at least some %ix86/x86_64 machines with fglrx/
+  nvidia driver IIRC; it needs to verified if this problem is still
+  reproducable ... (Bug #308693, comment #25)
+
 -------------------------------------------------------------------
 Wed Oct  3 14:55:42 CEST 2007 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        2
+Release:        3
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -88,7 +88,6 @@ Patch77:        fbdevhw.diff
 Patch79:        edit_data_sanity_check.diff
 Patch80:        pixman.diff
 Patch81:        xserver-1.3.0-xkb-and-loathing.patch
-Patch334:       p_pci-domain.diff
 
 %description
 This package contains the X.Org Server.
@@ -177,15 +176,9 @@ popd
 %patch27
 %patch29
 ### Bug 197572: X.Org PCI/IA64 patches
-%ifnarch ia64
-%patch334 -p0 -b .p_pci-domain.diff
-%endif
 %patch30
 %patch32 -p1
-%ifarch ia64
 %patch34 -p0
-%else
-%endif
 %patch36 -p0
 %if %vnc
 %patch39 -p1
@@ -535,6 +528,14 @@ exit 0
 %endif
 %changelog
 * Wed Oct 03 2007 - sndirsch@suse.de
+- removed obsolete patch p_pci-domain.diff (Bug #308693, comment #26)
+- apply p_pci-off-by-one.diff.ia64 on all platforms since it clearly
+  only affects platforms, where INCLUDE_XF86_NO_DOMAIN is *not* set;
+  this still not explains why we have seen Xserver hangups with the
+  patch in place on at least some %%ix86/x86_64 machines with fglrx/
+  nvidia driver IIRC; it needs to verified if this problem is still
+  reproducable ... (Bug #308693, comment #25)
+* Wed Oct 03 2007 - sndirsch@suse.de
 - xserver-1.3.0-xkb-and-loathing.patch
   * Ignore (not just block) SIGALRM around calls to Popen()/Pclose().
   Fixes a hang in openoffice when opening menus. (Bug #245711)