[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'debian-unstable'



 debian/changelog                                                            |    7 ++
 debian/patches/53_Properly-initialize-io.pi_sel.pc_domain-on-kfreebsd.patch |   32 ++++++++++
 debian/patches/series                                                       |    1 
 3 files changed, 40 insertions(+)

New commits:
commit ab83e47b93d2c6add5514304cbe21b31f88b5d4e
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Oct 6 18:38:04 2008 +0200

    Add patch from Petr Salinger to fix PCI domain support on kfreebsd

diff --git a/debian/changelog b/debian/changelog
index cc60ed9..53babc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.2-8) UNRELEASED; urgency=low
+
+  * Add patch from Petr Salinger to fix PCI domain support on kfreebsd
+    (closes: #499501).
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 06 Oct 2008 18:37:08 +0200
+
 xorg-server (2:1.4.2-7) unstable; urgency=low
 
   * Update debian/copyright to the SGI Free Software License B, version 2.0.
diff --git a/debian/patches/53_Properly-initialize-io.pi_sel.pc_domain-on-kfreebsd.patch b/debian/patches/53_Properly-initialize-io.pi_sel.pc_domain-on-kfreebsd.patch
new file mode 100644
index 0000000..acb6c6c
--- /dev/null
+++ b/debian/patches/53_Properly-initialize-io.pi_sel.pc_domain-on-kfreebsd.patch
@@ -0,0 +1,32 @@
+From 43b9645e4f5343757613c422c9e1204ba826d1f7 Mon Sep 17 00:00:00 2001
+From: Petr Salinger <Petr.Salinger@seznam.cz>
+Date: Mon, 6 Oct 2008 18:33:31 +0200
+Subject: [PATCH] Properly initialize io.pi_sel.pc_domain on kfreebsd
+
+---
+ hw/xfree86/os-support/bus/freebsdPci.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c
+index 63c00b2..b1f3dbd 100644
+--- a/hw/xfree86/os-support/bus/freebsdPci.c
++++ b/hw/xfree86/os-support/bus/freebsdPci.c
+@@ -133,6 +133,7 @@ freebsdPciCfgRead(PCITAG tag, int off)
+ {
+ 	struct pci_io io;
+ 	int error;
++	io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag);
+ 	io.pi_sel.pc_bus = BUS(tag);
+ 	io.pi_sel.pc_dev = DFN(tag) >> 3;
+ 	io.pi_sel.pc_func = DFN(tag) & 7;
+@@ -148,6 +149,7 @@ static void
+ freebsdPciCfgWrite(PCITAG tag, int off, CARD32 val)
+ {
+ 	struct pci_io io;
++	io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag);
+ 	io.pi_sel.pc_bus = BUS(tag);
+ 	io.pi_sel.pc_dev = DFN(tag) >> 3;
+ 	io.pi_sel.pc_func = DFN(tag) & 7;
+-- 
+1.5.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 55ff4fa..5c1b515 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,6 +26,7 @@
 50_Make-RandRQueryVersion-return-1.1-for-swapped-client.patch
 51_xevie-length.diff
 52_xevie-swap-replies.diff
+53_Properly-initialize-io.pi_sel.pc_domain-on-kfreebsd.patch
 91_ttf2pt1
 91_ttf2pt1_updates
 92_xprint-security-holes-fix.patch


Reply to: