Bug#808682: mplayer: FTBFS on kfreebsd: error: 'CDRIOCSETBLOCKSIZE' undeclared (first use in this function)

[Steven Chamberlain]

Control: tags -1 + patch

Hi!

A simple patch for this is attached;  we just need to include
sys/cdrio.h for a definition of that ioctl.  Though I don't have any
VCDs to really test this.

It seems there is a new stream/vcd_read_libcdio.h, and that is used in
preference if libcdio is detected:

--- a/stream_vcd.c
+++ b/stream_vcd.c
@@ -38,7 +38,9 @@
 #endif
 #include <errno.h>
 
+#if CONFIG_LIBCDIO
+#include "vcd_read_libcdio.h"
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include "vcd_read_fbsd.h"
 #elif defined(__APPLE__)
 #include "vcd_read_darwin.h"

Previously stream/vcd_read_fbsd.h was being used, and that would include
sys/cdrio.h itself, although that seems to have other issues now.  I
think we're best using stream/vcd_read_libcdio.h anyway on kfreebsd.

Thanks!
Regards,
-- 
Steven Chamberlain
steven at pyro.eu.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0300_kfreebsd_vcd.patch
Type: text/x-diff
Size: 430 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20151221/4883a5c5/attachment-0001.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20151221/4883a5c5/attachment-0001.sig>