[Pkg-utopia-maintainers] Bug#561076: hal: FTBFS on kfreebsd-* with 8.x kernel headers

[Petr Salinger]

Package: hal
Version: 0.5.13-6
Severity: important
Tags: patch
User: debian-bsd at lists.debian.org
Usertags: kfreebsd


Hi,

the current version fails to build on GNU/kFreeBSD with 8.x kernel 
headers.

The FreeBSD 8.0 kernel introduces a new USB stack with a totally
different API. The upstream used to have during 8.0 development
old USB stack in <legacy/dev/usb/usb.h>, we decided to provide it too.

To solve current FTBFS for 0.5.13 series please just use patch bellow.

For the new upstream release 0.5.14, the git log
  http://cgit.freedesktop.org/hal/log contains lines like
     2009-08-18        add USB2 support
     2009-08-18        add USB2 support to the FreeBSD backend

I believe it should not be so hard to extend it for GNU/kFreeBSD.
It will be needed at least to change build-depends to
 	libusb-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
         libusb2-dev [[kfreebsd-amd64 kfreebsd-i386]

and change checks like
 	"#if __FreeBSD_version >= 800064"
into
 	"#if (__FreeBSD_version >= 800064) || (__FreeBSD_kernel_version >= 800064)"

Sorry for the inconvenience.

Petr

--- hal-0.5.13.orig/hald/freebsd/hf-usb.c
+++ hal-0.5.13/hald/freebsd/hf-usb.c
@@ -31,7 +31,7 @@
  #include <fcntl.h>
  #include <sys/ioctl.h>
  #include <unistd.h>
-#include <dev/usb/usb.h>
+#include <legacy/dev/usb/usb.h>

  #include "../logger.h"
  #include "../osspec.h"
--- hal-0.5.13.orig/hald/freebsd/probing/probe-hiddev.c
+++ hal-0.5.13/hald/freebsd/probing/probe-hiddev.c
@@ -29,7 +29,7 @@
  #include <stdlib.h>
  #include <fcntl.h>
  #include <sys/ioctl.h>
-#include <dev/usb/usb.h>
+#include <legacy/dev/usb/usb.h>
  #include <dev/usb/usbhid.h>
  #include <usbhid.h>