xorg-server: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/patches/49_map_keyboard_driver_to_kbd.diff | 10 ++++++----
debian/patches/50_alpha_no_include_asm_pci.h.diff | 16 ++++++++++++++++
debian/patches/series | 1 +
4 files changed, 31 insertions(+), 4 deletions(-)
New commits:
commit 5c85d1aab2e75b88c371dd5cc8aedee61ec56ab5
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 14 16:11:10 2007 +0200
Include <sys/io.h> instead of <asm/pci.h> in hw/xfree86/os-support/linux/lnx.h
The latter isn't exported to userspace anymore, so this fixes an FTBFS
on alpha.
diff --git a/debian/changelog b/debian/changelog
index b23c74e..649ddb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.3.0.0.dfsg-9) unstable; urgency=medium
+
+ * Include <sys/io.h> instead of <asm/pci.h> in
+ hw/xfree86/os-support/linux/lnx.h, as the latter isn't exported to
+ userspace anymore; fixes FTBFS on alpha. Thanks, Steve Langasek!
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 14 Jul 2007 12:17:10 +0200
+
xorg-server (2:1.3.0.0.dfsg-8) unstable; urgency=medium
* Medium-urgency upload to get the fix for #428794 in testing faster,
diff --git a/debian/patches/49_map_keyboard_driver_to_kbd.diff b/debian/patches/49_map_keyboard_driver_to_kbd.diff
index 4491a79..6f8448f 100644
--- a/debian/patches/49_map_keyboard_driver_to_kbd.diff
+++ b/debian/patches/49_map_keyboard_driver_to_kbd.diff
@@ -32,9 +32,11 @@ Preserve compatibility with old xorg.conf files that have "keyboard" or
https://bugs.freedesktop.org/show_bug.cgi?id=11301
Debian bug#428794
---- hw/xfree86/common/xf86Init.c 2007-05-18 18:26:06.499884000 -0700
-+++ hw/xfree86/common/xf86Init.c 2007-05-22 16:13:04.691806000 -0700
-@@ -1033,6 +1033,14 @@
+Index: hw/xfree86/common/xf86Init.c
+===================================================================
+--- hw/xfree86/common/xf86Init.c.orig 2007-07-14 12:14:29.000000000 +0200
++++ hw/xfree86/common/xf86Init.c 2007-07-14 12:15:21.000000000 +0200
+@@ -1032,6 +1032,14 @@
continue;
}
@@ -49,7 +51,7 @@ Debian bug#428794
#endif
if ((pDrv = MatchInput(pDev)) == NULL) {
-@@ -1953,6 +1961,11 @@
+@@ -1951,6 +1959,11 @@
if (name == NULL || *name == '\0')
continue;
diff --git a/debian/patches/50_alpha_no_include_asm_pci.h.diff b/debian/patches/50_alpha_no_include_asm_pci.h.diff
new file mode 100644
index 0000000..d4ec8e6
--- /dev/null
+++ b/debian/patches/50_alpha_no_include_asm_pci.h.diff
@@ -0,0 +1,16 @@
+<asm/pci.h> isn't exported to userspace, and the same definitions are
+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 @@
+
+ /* 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);
+
+ /*
diff --git a/debian/patches/series b/debian/patches/series
index 2d9c3e0..2a475cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,6 +27,7 @@
47_fbdevhw_magic_numbers.diff
48_disable_type1.diff
49_map_keyboard_driver_to_kbd.diff -p0
+50_alpha_no_include_asm_pci.h.diff
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
Reply to: