xorg-server: Changes to 'debian-unstable'
debian/changelog | 9 +++++++++
debian/patches/50_alpha_no_include_asm_pci.h.diff | 7 +++----
2 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 4fbea3be2cff5c830a21c58225acb996d3931555
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 14 18:14:38 2007 +0200
Fix previous patch: don't include <sys/io.h>
<sys/io.h> and hw/xfree86/common/compiler.h have incompatible declarations
for out[bwl] on alpha (yay).
diff --git a/debian/changelog b/debian/changelog
index 649ddb4..9bf4467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.3.0.0.dfsg-10) unstable; urgency=medium
+
+ * hw/xfree86/common/compiler.h and <sys/io.h> declare incompatible
+ prototypes for outb and friends, so change the patch from -9 to not
+ #include <sys/io.h> and rely on declarations in lnx.h itself for the
+ IOBASE_* macros.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 14 Jul 2007 18:06:14 +0200
+
xorg-server (2:1.3.0.0.dfsg-9) unstable; urgency=medium
* Include <sys/io.h> instead of <asm/pci.h> in
diff --git a/debian/patches/50_alpha_no_include_asm_pci.h.diff b/debian/patches/50_alpha_no_include_asm_pci.h.diff
index d4ec8e6..9aaa43d 100644
--- a/debian/patches/50_alpha_no_include_asm_pci.h.diff
+++ b/debian/patches/50_alpha_no_include_asm_pci.h.diff
@@ -3,14 +3,13 @@ both in <sys/io.h> and later in lnx.h.
Index: xorg-server/hw/xfree86/os-support/linux/lnx.h
===================================================================
---- xorg-server.orig/hw/xfree86/os-support/linux/lnx.h 2007-07-14 12:12:07.000000000 +0200
-+++ xorg-server/hw/xfree86/os-support/linux/lnx.h 2007-07-14 12:12:30.000000000 +0200
-@@ -11,7 +11,7 @@
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx.h 2007-07-14 18:04:59.000000000 +0200
++++ xorg-server/hw/xfree86/os-support/linux/lnx.h 2007-07-14 18:05:54.000000000 +0200
+@@ -11,7 +11,6 @@
/* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */
# include <linux/unistd.h>
-# include <asm/pci.h>
-+# include <sys/io.h>
extern long (*_iobase)(unsigned, int, int, int);
/*
Reply to: