xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 ++++++
debian/patches/50_alpha_no_include_asm_pci.h.diff | 24 ++++++++++++++++++----
2 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit f8249f1d86654ce9e14656a6eb5acbd2f1843849
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 14 20:12:44 2007 +0200
Yet another alpha build fix.
Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use
"lnx.h" and <unistd.h> instead
diff --git a/debian/changelog b/debian/changelog
index 9bf4467..8426a7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.3.0.0.dfsg-11) unstable; urgency=low
+
+ * Yet another alpha build fix: also remove the asm/pci.h include from
+ os-support/linux/lnx_axp.c. Include "lnx.h" and <unistd.h> instead.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 14 Jul 2007 20:09:35 +0200
+
xorg-server (2:1.3.0.0.dfsg-10) unstable; urgency=medium
* hw/xfree86/common/compiler.h and <sys/io.h> declare incompatible
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 9aaa43d..dc4ccaa 100644
--- a/debian/patches/50_alpha_no_include_asm_pci.h.diff
+++ b/debian/patches/50_alpha_no_include_asm_pci.h.diff
@@ -1,10 +1,11 @@
-<asm/pci.h> isn't exported to userspace, and the same definitions are
-both in <sys/io.h> and later in lnx.h.
+<asm/pci.h> isn't exported to userspace, and the same defines are
+also in lnx.h.
+Add unistd.h include for syscall().
Index: xorg-server/hw/xfree86/os-support/linux/lnx.h
===================================================================
---- 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
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx.h 2007-07-14 19:40:30.000000000 +0200
++++ xorg-server/hw/xfree86/os-support/linux/lnx.h 2007-07-14 20:03:37.000000000 +0200
@@ -11,7 +11,6 @@
/* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */
@@ -13,3 +14,18 @@ Index: xorg-server/hw/xfree86/os-support/linux/lnx.h
extern long (*_iobase)(unsigned, int, int, int);
/*
+Index: xorg-server/hw/xfree86/os-support/linux/lnx_axp.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx_axp.c 2007-07-14 20:03:46.000000000 +0200
++++ xorg-server/hw/xfree86/os-support/linux/lnx_axp.c 2007-07-14 20:05:52.000000000 +0200
+@@ -112,8 +112,8 @@
+ /*
+ * pciconfig_iobase wrappers and dynamic i/o selection
+ */
+-#include <linux/unistd.h>
+-#include <asm/pci.h>
++#include "lnx.h"
++#include <unistd.h>
+ #include <errno.h>
+
+ /* glibc versions (single hose only) */
Reply to: