Bug#523970: xorg-server: FTBFS on hurd-i386
Package: xorg-server
Version: 2:1.6.0-1
Severity: important
Tags: patch
Hello,
xorg-server FTBFS on hurd-i386 due to a few small things, here is a
patch.
Samuel
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.29 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--
Samuel
<y> t1 faich
<y> les programmes ils segfaultent jamais quand on veut
-+- #ens-mim en plein débogage -+-
--- hw/xfree86/os-support/bus/Pci.h.orig 2009-04-13 21:21:10.000000000 +0000
+++ 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
--- configure.ac.orig 2009-04-13 21:38:24.000000000 +0000
+++ 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"
--- hw/xfree86/os-support/hurd/Makefile.am.orig 2009-04-13 23:05:45.000000000 +0000
+++ 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 \
--- hw/xfree86/os-support/shared/stdResource.c.orig 2009-04-13 23:15:07.000000000 +0000
+++ 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
--- hw/xfree86/os-support/hurd/hurd_video.c.orig 2009-02-25 19:12:12.000000000 +0000
+++ 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;
-}
-
Reply to: