Hello community, here is the log from the commit of package xorg-x11-server checked in at Thu Aug 24 22:09:15 CEST 2006. -------- --- xorg-x11-server/xorg-x11-server.changes 2006-08-20 15:04:16.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2006-08-24 17:02:59.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Aug 24 16:59:21 CEST 2006 - sndirsch@suse.de + +- PCI/IA64 Patches (Bug #197572): + * removed p_mappciBIOS_complete.diff (already applied upstream) + * apply p_pci-ia64.diff + * apply p_pci-legacy-mmap.diff only for IA64 (as before) + * disabled for now: + - p_pci-domain.diff: still issues with it + - p_pci-ce-x.diff: sits on top of p_pci-domain.diff + +------------------------------------------------------------------- Old: ---- p_mappciBIOS_complete.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.ey4onw/_old 2006-08-24 22:08:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ey4onw/_new 2006-08-24 22:08:45.000000000 +0200 @@ -17,7 +17,7 @@ URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.1 -Release: 20 +Release: 22 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -53,7 +53,6 @@ Patch334: p_pci-domain.diff Patch350: p_pci-ia64.diff Patch357: p_pci-ce-x.diff -Patch359: p_mappciBIOS_complete.diff Patch364: p_pci-legacy-mmap.diff %description @@ -201,16 +200,17 @@ popd %patch19 %patch20 -p1 -### Bug 197572: X.Org PCI patches stilll left -#%patch334 -p2 -b .p_pci-domain.diff -#pushd hw/xfree86/os-support/bus -#%patch350 -p0 -b .p_pci-ia64.diff -#popd -#%patch357 -p4 -b .p_pci-ce-x.diff -#%patch359 -p2 -b .p_mappciBIOS_complete.diff -#%ifarch ia64 -#%patch364 -p4 -b .p_pci-legacy-mmap.diff -#%endif +### Bug 197572: X.Org PCI patches still left +### disabled for now (still issues with it) +#%patch334 -p0 -b .p_pci-domain.diff +pushd hw/xfree86/os-support/bus +%patch350 -p0 -b .p_pci-ia64.diff +popd +### sits on top of p_pci-domain.diff ! +#%patch357 -p0 -b .p_pci-ce-x.diff +%ifarch ia64 +%patch364 -p4 -b .p_pci-legacy-mmap.diff +%endif %build autoreconf -fi @@ -498,6 +498,14 @@ %endif %changelog -n xorg-x11-server +* Thu Aug 24 2006 - sndirsch@suse.de +- PCI/IA64 Patches (Bug #197572): + * removed p_mappciBIOS_complete.diff (already applied upstream) + * apply p_pci-ia64.diff + * apply p_pci-legacy-mmap.diff only for IA64 (as before) + * disabled for now: +- p_pci-domain.diff: still issues with it +- p_pci-ce-x.diff: sits on top of p_pci-domain.diff * Sun Aug 20 2006 - sndirsch@suse.de - added PCI/IA64 patches, but disabled them for now (Bug #197572) - remove comp. symlinks in /usr/X11R6/bin for openSUSE >= 10.2 ++++++ p_pci-ce-x.diff ++++++ --- /var/tmp/diff_new_pack.ey4onw/_old 2006-08-24 22:08:47.000000000 +0200 +++ /var/tmp/diff_new_pack.ey4onw/_new 2006-08-24 22:08:47.000000000 +0200 @@ -1,7 +1,6 @@ -Index: BUILD/xc/programs/Xserver/hw/xfree86/os-support/bus/altixPCI.c -=================================================================== ---- BUILD.orig/xc/programs/Xserver/hw/xfree86/os-support/bus/altixPCI.c 2006-01-21 08:46:04.244732956 -0600 -+++ BUILD/xc/programs/Xserver/hw/xfree86/os-support/bus/altixPCI.c 2006-01-25 15:12:20.480002301 -0600 +diff -urp ../xorg-server-1.1.99.3.old/hw/xfree86/os-support/bus/altixPCI.c ./hw/xfree86/os-support/bus/altixPCI.c +--- ../xorg-server-1.1.99.3.old/hw/xfree86/os-support/bus/altixPCI.c 2006-08-22 15:35:31.000000000 +0200 ++++ ./hw/xfree86/os-support/bus/altixPCI.c 2006-08-24 16:16:52.000000000 +0200 @@ -11,75 +11,6 @@ #include "xf86.h" #include "Pci.h" @@ -78,7 +77,7 @@ void xf86PreScanAltix(void) { /* Nothing to see here... */ -@@ -88,36 +19,65 @@ +@@ -88,36 +19,65 @@ void xf86PreScanAltix(void) void xf86PostScanAltix(void) { pciConfigPtr *pdev; @@ -167,33 +166,10 @@ } - return; } -Index: BUILD/xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c -=================================================================== ---- BUILD.orig/xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2006-01-21 08:46:04.252733905 -0600 -+++ BUILD/xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2006-01-25 16:39:26.097094793 -0600 -@@ -412,8 +412,9 @@ - pciBusInfo_t *pBusInfo; - - while ((bus < pciNumBuses) && (pBusInfo = pciBusInfo[bus])) { -- if (bus == pBusInfo->primary_bus) -+ if (bus == pBusInfo->primary_bus) { - return pBusInfo->bridge; -+ } - bus = pBusInfo->primary_bus; - } - -@@ -609,8 +610,9 @@ - - result = mmap(NULL, Size + Offset, prot, mmapflags, fd, realBase); - -- if (!result || ((pointer)result == MAP_FAILED)) -+ if (!result || ((pointer)result == MAP_FAILED)) { - return NULL; -+ } - - xf86MakeNewMapping(ScreenNum, Flags, realBase, Size + Offset, result); - -@@ -656,7 +658,7 @@ +diff -urp ../xorg-server-1.1.99.3.old/hw/xfree86/os-support/bus/linuxPci.c ./hw/xfree86/os-support/bus/linuxPci.c +--- ../xorg-server-1.1.99.3.old/hw/xfree86/os-support/bus/linuxPci.c 2006-08-22 17:47:35.000000000 +0200 ++++ ./hw/xfree86/os-support/bus/linuxPci.c 2006-08-24 16:16:52.000000000 +0200 +@@ -653,7 +653,7 @@ linuxOpenLegacy(PCITAG Tag, char *name) return fd; } @@ -202,7 +178,7 @@ if (!pBusInfo || (bridge == pBusInfo->bridge) || !(bridge = pBusInfo->bridge)) { xfree(path); -@@ -688,7 +690,7 @@ +@@ -685,7 +685,7 @@ xf86MapDomainMemory(int ScreenNum, int F * We use /proc/bus/pci on non-legacy addresses or if the Linux sysfs * legacy_mem interface is unavailable. */ @@ -211,7 +187,7 @@ return linuxMapPci(ScreenNum, Flags, Tag, Base, Size, PCIIOC_MMAP_IS_MEM); -@@ -776,8 +778,8 @@ +@@ -773,8 +773,8 @@ xf86ReadDomainMemory(PCITAG Tag, ADDRESS bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag)); dev = PCI_DEV_FROM_TAG(Tag); func = PCI_FUNC_FROM_TAG(Tag); @@ -222,13 +198,13 @@ /* * If the caller wants the ROM and the sysfs rom interface exists, -@@ -1036,7 +1038,37 @@ - } +@@ -1072,7 +1072,37 @@ ia64linuxPciFindNext(void) + } - if (sscanf(entry->d_name, "%02x . %01x", &dev, &func) == 2) { + if (sscanf(entry->d_name, "%02x . %01x", &dev, &func) == 2) { + CARD32 tmp; + - pciDeviceTag = PCI_MAKE_TAG(PCI_MAKE_BUS(domain, bus), dev, func); + pciDeviceTag = PCI_MAKE_TAG(PCI_MAKE_BUS(domain, bus), dev, func); + + /* + * Check if the device is a pci-pci bridge. If so, make sure the @@ -257,44 +233,6 @@ + } + } + - devid = pciReadLong(pciDeviceTag, PCI_ID_REG); - if ((devid & pciDevidMask) == pciDevid) - /* Yes - Return it. Otherwise, next device */ -Index: BUILD/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c -=================================================================== ---- BUILD.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c 2006-01-21 08:46:04.248733430 -0600 -+++ BUILD/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c 2006-01-25 16:39:49.491878366 -0600 -@@ -43,8 +43,8 @@ - - pciInfoFromTag(tag, &domain, &bus, &dev, &fn); - -- sprintf(c, "/sys/devices/pci%04x:%02x/%04x:%02x:%02x.%1x/resource", -- domain, bus, domain, bus, dev, fn); -+ sprintf(c, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/resource", -+ domain, bus, dev, fn); - if (file = fopen(c, "r")) { - for (resource=0; resource != index; resource++) - fgets(c, 0x1ff, file); -@@ -134,8 +134,8 @@ - - pciInfoFromTag(tag, &domain, &bus, &dev, &fn); - -- sprintf(c, "/sys/devices/pci%04x:%02x/%04x:%02x:%02x.%1x/resource", -- domain, bus, domain, bus, dev, fn); -+ sprintf(c, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/resource", -+ domain, bus, dev, fn); - if (file = fopen(c, "r")) { - for (resource=0; resource != index; resource++) - fgets(c, 0x1ff, file); -@@ -212,8 +212,8 @@ - - pciInfoFromTag(tag, &domain, &bus, &dev, &fn); - -- sprintf(c, "/sys/devices/pci%04x:%02x/%04x:%02x:%02x.%1x/resource", -- domain, bus, domain, bus, dev, fn); -+ sprintf(c, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/resource", -+ domain, bus, dev, fn); - if (file = fopen(c, "r")) { - unsigned long savePtr; - for (ndx=0; ndx < 7; ndx++) { - + devid = pciReadLong(pciDeviceTag, PCI_ID_REG); + if ((devid & pciDevidMask) == pciDevid) + /* Yes - Return it. Otherwise, next device */ ++++++ p_pci-domain.diff ++++++ ++++ 869 lines (skipped) ++++ between xorg-x11-server/p_pci-domain.diff ++++ and xorg-x11-server/p_pci-domain.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org