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

[Björn Sandell]

On Sun, 28 Apr 2002, Arpi wrote:

> anyway, could you fix libmpdvdkit (imho it should work on openbsd)

Here we go, the latest diffs:

* Update documentation (needs more work).
* libmpdvdkit compiles (but won't, for some reason, use the css stuff,
  maybe i messed up configure...). 
* Resubmission of mp3lib/Makefile patch

Björn Sandell       DCE/DFS Sysadmin       IT department
Chalmers University of Technology    www.dce.chalmers.se
-------------- next part --------------
Index: DOCS/documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v
retrieving revision 1.236
diff -u -r1.236 documentation.html
--- DOCS/documentation.html	28 Apr 2002 05:20:52 -0000	1.236
+++ DOCS/documentation.html	29 Apr 2002 20:55:10 -0000
@@ -1614,20 +1614,17 @@
 /usr/ports/devel/gmake), native BSD make will not work, and a recent
 binutils (including objcopy).</P>
 
-<P>Presently you must give the option '<CODE>--disable-mpdvdkit</CODE>' to 
-configure, else it won't compile.</P>
-
 <P>Due to limitations in different versions of gas (relocation vs mmx),
 you'll need to compile in two steps: First make sure that the
 non-native as is first in PATH and do a '<CODE>gmake -k</CODE>', then make sure
-that the native version i used an do '<CODE>gmake</CODE>'.</P>
+that the native version is used and do '<CODE>gmake</CODE>'.</P>
 
 <P>To use Win32 DLLs with <B>MPlayer</B> you will need to re-compile the
 kernel with "<CODE>option USER_LDT</CODE>".</P>
 
 <P>If <B>MPlayer</B> complains about not finding '/dev/cdrom' or
 '/dev/dvd' make a symbolic link, eg <CODE>ln -s
-/dev/(your_cdrom_device) /dev/cdrom</CODE></P>
+/dev/rcd0c /dev/dvd</CODE></P>
 
 
 <P><B><A NAME=A>Appendix A - Authors</A></B></P>
Index: libmpdvdkit/ioctl.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit/ioctl.h,v
retrieving revision 1.1
diff -u -r1.1 ioctl.h
--- libmpdvdkit/ioctl.h	24 Apr 2002 19:28:03 -0000	1.1
+++ libmpdvdkit/ioctl.h	29 Apr 2002 20:55:11 -0000
@@ -262,3 +262,9 @@
 
 #endif
 
+#ifdef __OpenBSD__
+typedef union dvd_struct dvd_struct;
+typedef union dvd_authinfo dvd_authinfo;
+typedef u_int8_t dvd_key[5];            /* 40-bit value, MSB is first elem. */
+typedef u_int8_t dvd_challenge[10];     /* 80-bit value, MSB is first elem. */
+#endif
Index: mp3lib/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- mp3lib/Makefile	13 Apr 2002 19:14:34 -0000	1.27
+++ mp3lib/Makefile	29 Apr 2002 20:55:11 -0000
@@ -38,7 +38,9 @@
 ifeq ($(TARGET_OS),CYGWIN)
 	./mp3lib_objfix.sh
 endif
-
+ifeq ($(TARGET_OS),OpenBSD)
+	./mp3lib_objfix.sh
+endif
 test1:	libMP3.a test.c
 	$(CC) $(CFLAGS) test.c ../libvo/aclib.c -o test1 -I.. -L. -lMP3 -lm