[MPlayer-dev-eng] [PATCH] OpenBSD, take 2

[Steven M. Schultz]

On Sun, 28 Apr 2002, Arpi wrote:

> anyway, could you fix libmpdvdkit (imho it should work on openbsd)
> or should i disable it for openbsd by default?

	If libdvdread is installed on the system should that take priority
	over libmpdvdkit?  If you disable it by default for openbsd could
	you also disable it for BSD/OS?   Thanks!

	The changes below enable building on BSD/OS.   The problem I am
	having is that while BSD/OS is a "BSD" system the DVD interface
	was made to look like that of Linux (makes porting applications
	easier).  

	I can't seem to find a simple way to have ./configure set
	
		#define HAVE_LINUX_DVD_STRUCT 1
		#undef DVD_STRUCT_IN_DVD_H
		#undef HAVE_BSD_DVD_STRUCT

	The changes (small) I made are attached.   I hope they are not too
	ugly ;)
	
	Steven Schultz
	sms at 2bsd.com
-------------- next part --------------
--- ioctl.c.dist        Wed Apr 24 12:28:03 2002
+++ ioctl.c     Wed Apr 24 17:41:11 2002
@@ -53,7 +53,9 @@
 #   include <dvd.h>
 #endif
 #ifdef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H
-#   include <BSDI_dvdioctl/dvd.h>
+#   undef DVD_STRUCT_IN_DVD_H
+#   define HAVE_LINUX_DVD_STRUCT
+#   include <dvd.h>
 #endif
 #ifdef SYS_BEOS
 #   include <malloc.h>

	And changed ./configure like this:

--- configure.dist      Wed Apr 24 16:17:51 2002
+++ configure   Wed Apr 24 17:32:18 2002
@@ -1585,13 +1585,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