|
|
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15117
Modified Files:
xorg-x11-server.spec
Added Files:
xorg-x11-server-1.1.1-pci-paranoia.patch
Log Message:
* Fri Aug 25 2006 Adam Jackson <ajackson@xxxxxxxxxx> 1.1.1-30.fc6
- xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail
gracefully if xf86PciVideoInfo is NULL (like, on Xen).
xorg-x11-server-1.1.1-pci-paranoia.patch:
xf86Helper.c | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE xorg-x11-server-1.1.1-pci-paranoia.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86Helper.c.jx 2006-08-25
14:40:56.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Helper.c 2006-08-25
14:43:47.000000000 -0400
@@ -1650,6 +1650,8 @@ xf86MatchPciInstances(const char *driver
*foundEntities = NULL;
+ if (!xf86PciVideoInfo)
+ return 0;
/* Each PCI device will contribute at least one entry. Each device
* section can contribute at most one entry. The sum of the two is
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- xorg-x11-server.spec 25 Aug 2006 04:54:22 -0000 1.159
+++ xorg-x11-server.spec 25 Aug 2006 21:54:45 -0000 1.160
@@ -8,7 +8,7 @@
# upgrades to officially released distribution releases, if the package
# Version field above is not changing, append and/or bump a digit /after/
# the dist tag. ie: 25%{?dist}.0 -> 25%{?dist}.1 ...
-Release: 29%{?dist}
+Release: 30%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -70,6 +70,7 @@
Patch3013: xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch
Patch3014: xorg-x11-server-1.1.1-infer-virtual.patch
Patch3015: xorg-x11-server-1.1.1-mode-sort-kung-fu.patch
+Patch3016: xorg-x11-server-1.1.1-pci-paranoia.patch
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@@ -376,6 +377,7 @@
%patch3013 -p1 -b .mouse-device
%patch3014 -p1 -b .infer-virtual
%patch3015 -p1 -b .sort-modes
+%patch3016 -p1 -b .pci-paranoia
%build
#FONTDIR="${datadir}/X11/fonts"
@@ -705,6 +707,10 @@
# -------------------------------------------------------------------
%changelog
+* Fri Aug 25 2006 Adam Jackson <ajackson@xxxxxxxxxx> 1.1.1-30.fc6
+- xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail
+ gracefully if xf86PciVideoInfo is NULL (like, on Xen).
+
* Fri Aug 25 2006 Kristian Høgsberg <krh@xxxxxxxxxx> - 1.1.1-29.fc6
- Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|