debian/changelog | 7 ++
debian/patches/20_hurd-i386.diff | 105 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 113 insertions(+)
New commits:
commit 87b7315679047c674f90d8ff232d5123244780ce
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Apr 15 15:30:43 2009 +0200
Add 20_hurd-i386.diff to fix FTBFS on hurd-i386
diff --git a/debian/changelog b/debian/changelog
index 3713af9..b3f23bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.6.1-2) UNRELEASED; urgency=low
+
+ * Add 20_hurd-i386.diff to fix FTBFS on hurd-i386,
+ thanks Samuel Thibault! (closes: #523970)
+
+ -- Brice Goglin <bgog...@debian.org> Wed, 15 Apr 2009 15:32:04 +0200
+
xorg-server (2:1.6.1-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/20_hurd-i386.diff b/debian/patches/20_hurd-i386.diff
new file mode 100644
index 0000000..22ed9dc
--- /dev/null
+++ b/debian/patches/20_hurd-i386.diff
@@ -0,0 +1,105 @@
+From: Samuel Thibault <samuel.thiba...@ens-lyon.org>
+
+Bug#523970: xorg-server: FTBFS on hurd-i386
+
+--- a/hw/xfree86/os-support/bus/Pci.h.orig 2009-04-13 21:21:10.000000000
+0000
++++ b/hw/xfree86/os-support/bus/Pci.h 2009-04-13 21:22:38.000000000 +0000
+@@ -169,7 +169,7 @@
+ #endif /* !defined(DEBUGPCI) */
+
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
+- defined(__DragonFly__) || defined(__sun)
++ defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
+ #define ARCH_PCI_INIT bsdPciInit
+ #endif
+
+--- a/configure.ac.orig 2009-04-13 21:38:24.000000000 +0000
++++ b/configure.ac 2009-04-13 21:38:27.000000000 +0000
+@@ -1356,6 +1356,9 @@
+ gnu*)
+ XORG_OS="gnu"
+ XORG_OS_SUBDIR="hurd"
++ # Use the same stubs as BSD for old functions, since we now
++ # use libpciaccess for PCI
++ xorg_bus_bsdpci="yes"
+ ;;
+ *)
+ XORG_OS="unknown"
+--- a/hw/xfree86/os-support/hurd/Makefile.am.orig 2009-04-13
23:05:45.000000000 +0000
++++ b/hw/xfree86/os-support/hurd/Makefile.am 2009-04-13 23:07:12.000000000
+0000
+@@ -5,6 +5,7 @@
+ $(srcdir)/../shared/VTsw_noop.c \
+ $(srcdir)/../shared/posix_tty.c \
+ $(srcdir)/../shared/stdResource.c \
++ $(srcdir)/../shared/vidmem.c \
+ $(srcdir)/../shared/sigiostubs.c \
+ $(srcdir)/../shared/pm_noop.c \
+ $(srcdir)/../shared/kmod_noop.c \
+--- a/hw/xfree86/os-support/shared/stdResource.c.orig 2009-04-13
23:15:07.000000000 +0000
++++ b/hw/xfree86/os-support/shared/stdResource.c 2009-04-13
23:15:33.000000000 +0000
+@@ -44,7 +44,7 @@
+ #include "bus/Pci.h"
+
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+- defined(__DragonFly__) || defined(__sun)
++ defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
+ #define xf86StdAccResFromOS xf86AccResFromOS
+ #endif
+
+--- a/hw/xfree86/os-support/hurd/hurd_video.c.orig 2009-02-25
19:12:12.000000000 +0000
++++ b/hw/xfree86/os-support/hurd/hurd_video.c 2009-04-13 23:55:16.000000000
+0000
+@@ -41,8 +41,8 @@
+ /**************************************************************************
+ * Video Memory Mapping section
+ ***************************************************************************/
+-pointer
+-xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
++static pointer
++mapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
+ {
+ mach_port_t device,iopl_dev;
+ memory_object_t iopl_mem;
+@@ -95,8 +95,8 @@
+ return (pointer)addr;
+ }
+
+-void
+-xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size)
++static void
++unmapVidMem(int ScreenNum,pointer Base,unsigned long Size)
+ {
+ kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size);
+ if( err )
+@@ -107,12 +107,6 @@
+ return;
+ }
+
+-Bool
+-xf86LinearVidMem()
+-{
+- return(TRUE);
+-}
+-
+ /**************************************************************************
+ * I/O Permissions section
+ ***************************************************************************/
+@@ -143,14 +137,10 @@
+ }
+
+ void
+-xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base,
+- unsigned long Size)
++xf86OSInitVidMem(VidMemInfoPtr pVidMem)
+ {
++ pVidMem->linearSupported = TRUE;
++ pVidMem->mapMem = mapVidMem;
++ pVidMem->unmapMem = unmapVidMem;
++ pVidMem->initialised = TRUE;
+ }
+-
+-Bool
+-xf86CheckMTRR(int s)
+-{
+- return FALSE;
+-}
+-
diff --git a/debian/patches/series b/debian/patches/series
index 1529a77..9949d6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
001_fedora_extramodes.patch
#13_debian_add_xkbpath_env_variable.diff
+20_hurd-i386.diff
0001-xorg.conf-5-refer-to-mousedrv-4-.-Debian-394058.patch
Turn-on-ModeDebug-by-default.patch
Add-libgcrypt-as-an-option-for-sha1.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
