Package: libcdaudio Version: 0.99.12p2-10 Severity: important Tags: patch User: debian-h...@lists.debian.org Usertags: hurd
Hello, libcdaudio currently FTBFS on hurd-i386, due to inclusion of a linux-specific header <linux/cdrom.h>. The attached patch fixes it by including <sys/cdrom.h> instead, could you please apply it? Thanks, Samuel -- System Information: Debian Release: wheezy/sid APT prefers unreleased APT policy: (500, 'unreleased'), (500, 'unstable') Architecture: hurd-i386 (i686-AT386) Kernel: GNU-Mach 1.3.99/Hurd-0.3 Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -ur libcdaudio-0.99.12p2.orig/configure.ac libcdaudio-0.99.12p2/configure.ac --- libcdaudio-0.99.12p2.orig/configure.ac 2005-08-16 08:02:52.000000000 +0200 +++ libcdaudio-0.99.12p2/configure.ac 2011-11-08 02:33:16.000000000 +0100 @@ -97,7 +97,7 @@ AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h linux/cdrom.h linux/ucdrom.h sys/cdio.h io/cam/cdrom.h stdarg.h mntent.h sys/mntent.h sys/types.h sys/param.h sys/ucred.h sys/mount.h strings.h,,, +AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h linux/cdrom.h linux/ucdrom.h sys/cdrom.h sys/cdio.h io/cam/cdrom.h stdarg.h mntent.h sys/mntent.h sys/types.h sys/param.h sys/ucred.h sys/mount.h strings.h,,, [[#if defined (HAVE_SYS_TYPES_H) # include <sys/types.h> #endif diff -ur libcdaudio-0.99.12p2.orig/src/cdaudio.c libcdaudio-0.99.12p2/src/cdaudio.c --- libcdaudio-0.99.12p2.orig/src/cdaudio.c 2004-09-09 02:26:20.000000000 +0200 +++ libcdaudio-0.99.12p2/src/cdaudio.c 2011-11-08 02:34:24.000000000 +0100 @@ -70,6 +70,11 @@ #include <linux/ucdrom.h> #endif +#ifdef HAVE_SYS_CDROM_H +#include <sys/cdrom.h> +#define NON_BLOCKING +#endif + /* For FreeBSD, OpenBSD, and Solaris */ #ifdef HAVE_SYS_CDIO_H #include <sys/cdio.h> diff -ur libcdaudio-0.99.12p2.orig/src/changer.c libcdaudio-0.99.12p2/src/changer.c --- libcdaudio-0.99.12p2.orig/src/changer.c 2001-08-18 15:44:32.000000000 +0200 +++ libcdaudio-0.99.12p2/src/changer.c 2011-11-08 02:33:07.000000000 +0100 @@ -36,6 +36,10 @@ #include <linux/ucdrom.h> #endif +#ifdef HAVE_SYS_CDROM_H +#include <sys/cdrom.h> +#endif + /* Choose a particular disc from the CD changer */ int cd_changer_select_disc(int cd_desc, int disc)
