[MPlayer-dev-eng] libmpdvdkit works on BSD/OS - patch included

Steven M. Schultz sms at 2BSD.COM
Wed May 1 01:25:37 CEST 2002


Greetings -

	If this does not break anything could it be included before rc3?

	The problem is that the directories "BSDI_dvdioctl" and 
	"extras/BSDI_dvdioctl" only exist within the 'vlc' program from 
	Videolan.Org - the pathnames are incorrect for MPlayer.

	The only other small change to ./configure was to make sure that
	DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H is _not_ set unless the system is
	"bsdos" - that shouldn't break anything (and indeed might help prevent
	breaking something).

	With these changes I can build/use 'libmpdvdkit' on BSD/OS.

	Thanks!

	Cheers,
	Steven Schultz
	sms at 2bsd.com

------------------------cut here------------------------
--- configure.dist	Tue Apr 30 16:02:25 2002
+++ configure	Tue Apr 30 16:17:06 2002
@@ -1612,13 +1612,13 @@
 echores "$_dvd"
 
 
-echocheck "extras/BSDI_dvdioctl/dvd.h"
+echocheck "BSDI dvd.h"
 cat > $TMPC << EOF
-#include <extras/BSDI_dvdioctl/dvd.h>
+#include <dvd.h>
 int main(void) { return 0; }
 EOF
 _bsdi_dvd=no
-cc_check && _bsdi_dvd=yes
+cc_check && bsdos && _bsdi_dvd=yes
 if test "$_bsdi_dvd" = yes ; then
   _def_bsdi_dvd='#define DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H 1'
 else
--- libmpdvdkit/ioctl.c.dist	Wed Apr 24 12:28:03 2002
+++ libmpdvdkit/ioctl.c	Tue Apr 30 16:12:25 2002
@@ -53,7 +53,7 @@
 #   include <dvd.h>
 #endif
 #ifdef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H
-#   include <BSDI_dvdioctl/dvd.h>
+#   include <dvd.h>
 #endif
 #ifdef SYS_BEOS
 #   include <malloc.h>



More information about the MPlayer-dev-eng mailing list