Control: tags -1 + upstream patch Hi!
Upstream has committed a patch for this, attached. I just tested that it builds now on kfreebsd-amd64. Thanks, Regards, -- Steven Chamberlain ste...@pyro.eu.org
Description: Add revision 37570 from the 1.2 branch. Fix build regression on FreeBSD. . When building with libcdio, CDRIOCSETBLOCKSIZE is an undefined symbol and compilation breaks. . The ioctl call in question will be performed by libcdio itself, so it can be omitted on FreeBSD with libcdio. . Reported by Thomas Zander, thomas.e.zander googlemail com. Author: Ingo Brückl <i...@wupperonline.de> Forwarded: not-needed Index: mplayer/stream/stream_vcd.c =================================================================== --- mplayer/stream/stream_vcd.c (revision 37568) +++ mplayer/stream/stream_vcd.c (revision 37570) @@ -137,7 +137,7 @@ struct stream_priv_s* p = opts; int ret,ret2,f,sect,tmp; mp_vcd_priv_t* vcd; -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(CONFIG_LIBCDIO) int bsize = VCD_SECTOR_SIZE; #endif #if defined(__MINGW32__) || defined(__CYGWIN__) @@ -248,7 +248,7 @@ mp_msg(MSGT_OPEN,MSGL_V,"VCD start byte position: 0x%X end: 0x%X\n",ret,ret2); -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(CONFIG_LIBCDIO) if (ioctl (f, CDRIOCSETBLOCKSIZE, &bsize) == -1) { mp_msg(MSGT_OPEN,MSGL_WARN,"Error in CDRIOCSETBLOCKSIZE"); }
signature.asc
Description: Digital signature