Hi! On 2015-12-21 21:23 +0000, Steven Chamberlain wrote: > 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:
There is currently some discussion about freebsd builds on mplayer-users: http://lists.mplayerhq.hu/pipermail/mplayer-users/2015-December/thread.html#88194 Ingo thinks the ioctl might not be needed when using libcdio: http://lists.mplayerhq.hu/pipermail/mplayer-users/2015-December/088195.html Alexander > --- 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 > [email protected] > From: Steven Chamberlain <[email protected]> > Subject: missing include for FreeBSD ioctls > Date: Mon, 21 Dec 2015 21:21:36 +0000 > > --- a/stream/vcd_read_libcdio.h > +++ b/stream/vcd_read_libcdio.h > @@ -33,6 +33,10 @@ > #include <cdio/paranoia/paranoia.h> > #endif > > +#if defined(__FreeBSD_kernel__) > +#include <sys/cdrio.h> > +#endif > + > /** Private vcd data. */ > typedef struct { > track_t track; /**< Current track being played. */
