[MPlayer-dev-eng] [PATH] libmpdvdkit and tvi_bsdbt848 on NetBSD

[Steven M. Schultz]

On Sun, 28 Apr 2002, Arpi wrote:

> bsdi:  no dvd.h, use /sys/dev/scsi/scsi_ioctl.h + extras/BSDI_dvdioctl/dvd.h

	There *is* a <dvd.h> on bsdi

> #define NEED_BSDI_LIBDVD
> #define DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H
> #define LINUX_DVD_STRUCT
> link bsdi_dvdioctl.o

	But bsdi_dvdioctl.o does not exist.    

> i'll disable it a picsaba, enabled only for freebsd and linux by default.
> if you want and can fix it for other bsd variants, do it and send patch

	Attached is a very small patch that takes care of BSD/OS

	The "extras/" directory only exists in the VLC code base.  I do
	think you want to import additional files from the 'vlc' program,
	so simply changing one (1) line in libmpdvdkit/ioctl.c is
	probably the best way to go.   Changing

	#   include <BSDI_dvdioctl/dvd.h>

	to

	#   include <dvd.h>

	in libmpdvdkit is all that is needed.

	The ./configure script only needs to have two lines changed:

	-echocheck "extras/BSDI_dvdioctl/dvd.h"
	+echocheck "BSDI dvd.h"

	-#include <extras/BSDI_dvdioctl/dvd.h>
	+#include <dvd.h>

	With those small changes libmpdvdkit works fine for me now

	What do you think (I hope the confusion is going away ;))?

	The new configure script looks good!

	Cheers,
	Steven Schultz
	sms at 2bsd.com
-------------- next part --------------
--- configure.dist	Sun Apr 28 15:02:45 2002
+++ configure	Sun Apr 28 15:06:32 2002
@@ -1612,9 +1612,9 @@
 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
--- libmpdvdkit/ioctl.c.dist	Wed Apr 24 12:28:03 2002
+++ libmpdvdkit/ioctl.c	Sun Apr 28 15:10:43 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>