* libdvdcss port to OpenBSD.

configure.in

@@ -405,6 +405,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
   AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h dvd.h)
   BSD_DVD_STRUCT=0
   LINUX_DVD_STRUCT=0
+  OPENBSD_DVD_STRUCT=0
   dnl
   dnl Old FreeBSD: sys/cdio.h
   dnl
@@ -412,7 +413,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
     AC_DEFINE(DVD_STRUCT_IN_SYS_CDIO_H, 1,
               Define if <sys/cdio.h> defines dvd_struct.)
     AC_EGREP_HEADER(struct dvd_struct,sys/cdio.h,[
-                    BSD_DVD_STRUCT=1],[LINUX_DVD_STRUCT=1])
+                    BSD_DVD_STRUCT=1],[LINUX_DVD_STRUCT=1; OPENBSD_DVD_STRUCT=1])
   ])
   dnl
   dnl Newer FreeBSD: sys/dvdio.h
@@ -466,6 +467,10 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
   if test x$LINUX_DVD_STRUCT = x1; then
     AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
               Define if Linux-like dvd_struct is defined.)
+    if test x$OPENBSD_DVD_STRUCT = x1; then
+      AC_DEFINE(HAVE_OPENBSD_DVD_STRUCT, 1,
+                Define if OpenBSD-like dvd_struct is defined.)
+    fi
   else
     if test x$BSD_DVD_STRUCT = x1; then
       AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,

extras/libdvdcss/ioctl.h

@@ -2,7 +2,7 @@
  * ioctl.h: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ioctl.h,v 1.7 2001/10/13 15:34:21 stef Exp $
+ * $Id: ioctl.h,v 1.8 2001/11/02 13:30:38 massiot Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -114,6 +114,17 @@ int ioctl_SendKey2          ( int, int *, u8 * );
 #   define DVD_INVALIDATE_AGID      0x3f
 #endif
 
+#if defined( HAVE_OPENBSD_DVD_STRUCT )
+
+/*****************************************************************************
+ * OpenBSD ioctl specific
+ *****************************************************************************/
+typedef union dvd_struct dvd_struct;
+typedef union dvd_authinfo dvd_authinfo;
+typedef u_int8_t dvd_key[5];
+typedef u_int8_t dvd_challenge[10];
+#endif
+
 #if defined( WIN32 )
 
 /*****************************************************************************

include/defs.h.in

-/* include/defs.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+/* include/defs.h.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define to empty if the keyword does not work.  */
 #undef const
@@ -67,8 +67,8 @@
 /* Define if you have the </sys/dev/scsi/scsi_ioctl.h> header file.  */
 #undef HAVE__SYS_DEV_SCSI_SCSI_IOCTL_H
 
-/* Define if you have the <Carbon/Carbon.h> header file.  */
-#undef HAVE_CARBON_CARBON_H
+/* Define if you have the <Cocoa/Cocoa.h> header file.  */
+#undef HAVE_COCOA_COCOA_H
 
 /* Define if you have the <Ph.h> header file.  */
 #undef HAVE_PH_H
@@ -235,6 +235,9 @@
 /* Define if Linux-like dvd_struct is defined. */
 #undef HAVE_LINUX_DVD_STRUCT
 
+/* Define if OpenBSD-like dvd_struct is defined. */
+#undef HAVE_OPENBSD_DVD_STRUCT
+
 /* Define if FreeBSD-like dvd_struct is defined. */
 #undef HAVE_BSD_DVD_STRUCT
 

src/input/input.c

@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input.c,v 1.148 2001/11/01 15:30:50 sam Exp $
+ * $Id: input.c,v 1.149 2001/11/02 13:30:38 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -87,6 +87,7 @@
 static void RunThread       ( input_thread_t *p_input );
 static  int InitThread      ( input_thread_t *p_input );
 static void ErrorThread     ( input_thread_t *p_input );
+static void CloseThread     ( input_thread_t *p_input );
 static void DestroyThread   ( input_thread_t *p_input );
 static void EndThread       ( input_thread_t *p_input );