Bug#525475: xorg-server: FTBFS on GNU/kFreeBSD

[Petr Salinger <Petr.Salinger@seznam.cz>]

Package: xorg-server
Severity: important
Version: 2:1.6.1-1
Tags: patch
User: glibc-bsd-devel@lists.alioth.debian.org
Usertags: kfreebsd

Hi,

the current version fails to build on GNU/kFreeBSD.

It needs small tweaks, see bellow. It is just
addition "defined(__FreeBSD_kernel__) ||" into two places.

It would also be nice if you can ask upstream
to include this changes.

Thanks in advance

                        Petr


only in patch2:
unchanged:
--- xorg-server-1.6.1.orig/hw/xfree86/os-support/shared/stdResource.c
+++ xorg-server-1.6.1/hw/xfree86/os-support/shared/stdResource.c
@@ -44,7 +44,7 @@
 #include "bus/Pci.h"

 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
-       defined(__DragonFly__) || defined(__sun)
+       defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__sun)
 #define xf86StdAccResFromOS xf86AccResFromOS
 #endif

only in patch2:
unchanged:
--- xorg-server-1.6.1.orig/hw/xfree86/os-support/bus/Pci.h
+++ xorg-server-1.6.1/hw/xfree86/os-support/bus/Pci.h
@@ -169,7 +169,7 @@
 #endif /* !defined(DEBUGPCI) */

 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
-       defined(__DragonFly__) || defined(__sun)
+       defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__sun)
 #define ARCH_PCI_INIT bsdPciInit
 #endif