rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.417, 1.418 xserver-1.6.0-primary.patch, 1.1, 1.2
Adam Jackson
ajax at fedoraproject.org
Wed Mar 4 21:26:29 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4067
Modified Files:
xorg-x11-server.spec xserver-1.6.0-primary.patch
Log Message:
* Wed Mar 04 2009 Adam Jackson <ajax at redhat.com> 1.6.0-6
- Move fedora-setup-keyboard (and libdrm) Requires to the Xorg subpackage,
since they won't do anything at the top level.
- Remove BR: freetype freetype-devel.
- xserver-1.6.0-primary.patch: Only consider actual VGA devices.
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- xorg-x11-server.spec 4 Mar 2009 01:14:57 -0000 1.417
+++ xorg-x11-server.spec 4 Mar 2009 21:25:58 -0000 1.418
@@ -19,7 +19,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.6.0
-Release: 5%{?dist}
+Release: 6%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -45,10 +45,7 @@
# ABI version provides.
# XXX don't enable any of this yet. for serious.
Source30: find-provides
-#{expand:%%define prev__find_provides %{__find_provides}}
-#define pc_path %{buildroot}/%{_libdir}/pkgconfig/xorg-server.pc
-#define __find_provides %{SOURCE30} %{pc_path} %{prev__find_provides}
-#define __find_provides %{nil}
+#define __find_provides {nil}
# OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
@@ -88,7 +85,7 @@
Patch6015: xserver-1.5.99.902-vnc.patch
# Make autoconfiguration chose nouveau driver for NVIDIA GPUs
-Patch6017: xserver-1.5.99.902-nouveau.patch
+Patch6016: xserver-1.5.99.902-nouveau.patch
# from master, may end up in 1.6.1.
Patch6018: xserver-1.6.0-XIPropToInt.patch
@@ -128,7 +125,6 @@
BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel
BuildRequires: libX11-devel libXext-devel
BuildRequires: libXinerama-devel
-BuildRequires: freetype freetype-devel
# DMX config utils buildreqs.
BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel
@@ -144,10 +140,6 @@
# BuildRequires: mesa-source >= 7.1-0.36
# XXX silly...
BuildRequires: libdrm-devel >= 2.4.0 kernel-devel
-%if %{with_hw_servers}
-Requires: libdrm >= 2.4.0
-Requires: fedora-setup-keyboard
-%endif
BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1
BuildRequires: hal-devel dbus-devel
@@ -181,6 +173,8 @@
# virtuals. XXX fix the xkbcomp fork() upstream.
Requires: xkbdata xkbcomp
Requires: xorg-x11-server-common >= %{version}-%{release}
+Requires: libdrm >= 2.4.0
+Requires: fedora-setup-keyboard
# Dropped from F9 for being broken, uninstall it.
Obsoletes: xorg-x11-drv-magictouch <= 1.0.0.5-5.fc8
# Force sufficiently new libpciaccess
@@ -513,6 +507,12 @@
%changelog
+* Wed Mar 04 2009 Adam Jackson <ajax at redhat.com> 1.6.0-6
+- Move fedora-setup-keyboard (and libdrm) Requires to the Xorg subpackage,
+ since they won't do anything at the top level.
+- Remove BR: freetype freetype-devel.
+- xserver-1.6.0-primary.patch: Only consider actual VGA devices.
+
* Wed Mar 04 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-5
- Drop our own fedora-setup-keyboard script, Require: fedora-setup-keyboard
package instead.
xserver-1.6.0-primary.patch:
Index: xserver-1.6.0-primary.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.0-primary.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.6.0-primary.patch 3 Mar 2009 19:34:21 -0000 1.1
+++ xserver-1.6.0-primary.patch 4 Mar 2009 21:25:58 -0000 1.2
@@ -1,17 +1,30 @@
-From 9ee22b4f743a2850fed35f179c56f94ce4bb5242 Mon Sep 17 00:00:00 2001
+From 69e53f2493c142ef5569af01ce52565be5b2976e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Tue, 3 Mar 2009 10:58:33 -0500
Subject: [PATCH] Primary video device hack
---
- hw/xfree86/common/xf86pciBus.c | 54 ++++++++++++++++++++++++++++++++++-----
- 1 files changed, 47 insertions(+), 7 deletions(-)
+ hw/xfree86/common/xf86pciBus.c | 60 ++++++++++++++++++++++++++++++++--------
+ 1 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 467a0c3..f9999d8 100644
+index 467a0c3..0d2d01c 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -341,6 +341,39 @@ restorePciBusState(BusAccPtr ptr)
+@@ -60,11 +60,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw *
+ /* PCI classes that get included in xf86PciVideoInfo */
+ #define PCIINFOCLASSES(c) \
+ ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \
+- || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) \
+- || ((((c) & 0x00ffff00) \
+- == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \
+- || ((((c) & 0x00ffff00) \
+- == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) )
++ || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) )
+
+ /*
+ * PCI classes that have messages printed always. The others are only
+@@ -341,6 +337,39 @@ restorePciBusState(BusAccPtr ptr)
}
#undef MASKBITS
@@ -51,7 +64,7 @@
/*
* xf86Bus.c interface
-@@ -375,24 +408,31 @@ xf86PciProbe(void)
+@@ -375,24 +404,31 @@ xf86PciProbe(void)
}
}
More information about the fedora-extras-commits
mailing list