Web lists-archives.com

Re: [MPlayer-dev-eng] [MPlayer-users] Build regression on FreeBSD




I wrote on Sat, 19 Dec 2015 20:50:18 +0100:

> Thomas Zander wrote on Sat, 19 Dec 2015 20:21:08 +0100:

>> 2) stream/stream_vcd.c:
>>    when building with libcdio, vcd_read_fbsd.h is no longer included,
>>    which, in turn, causes for sys/cdrio.h not to be included.
>>    Subsequently CDRIOCSETBLOCKSIZE is an undefined symbol and
>>    compilation breaks. Including sys/cdrio.h in stream/stream_vcd.c
>>    resolves the problem and the build completes.

> I suppose we don't need the ioctl CDRIOCSETBLOCKSIZE in case of libcdio,
> do we? When libcdio is used, it should take care and the call should be
> unnecessary.

I found the ioctl CDRIOCSETBLOCKSIZE call in libcdio so we should go with the
attached patch.

Ingo
Index: stream/stream_vcd.c
===================================================================
--- stream/stream_vcd.c	(revision 37565)
+++ stream/stream_vcd.c	(working copy)
@@ -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");
   }
_______________________________________________
MPlayer-dev-eng mailing list
MPlayer-dev-eng@xxxxxxxxxxxx
https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng