shithub: libdvdcss

Download patch

ref: 7e6e6cf923890b0378725ca1cc0361708f33745d
parent: 75ffe329686f9bce2c84def92d6ecaa1373e1821
author: Sam Hocevar <[email protected]>
date: Wed Apr 3 20:26:54 EST 2002 

* ./configure.in: BeOS bug fix. I'm so lame.
  * ./src/ioctl.c: refuse to build if DVD ioctls weren't found.



--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,8 @@
 
 HEAD
 
-  * Nothing yet.
+  * ./configure.in: BeOS bug fix. I'm so lame.
+  * ./src/ioctl.c: refuse to build if DVD ioctls weren't found.
 
 1.1.0
 Wed,  3 Apr 2002 18:26:23 +0200
--- a/configure
+++ b/configure
@@ -5598,24 +5598,26 @@
 
 
 case x"${target_os}" in
-  x)
-    SYS=unknown
-    ;;
   xdarwin*)
-    SYS=darwin
+    CFLAGS="${CFLAGS} -no-cpp-precomp"
     ;;
+  xbeos*)
+    cat >> confdefs.h <<\EOF
+#define SYS_BEOS 1
+EOF
+
+    ;;
   x*)
-    SYS=${target_os}
     ;;
 esac
 
 echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:5614: checking for boolean_t in sys/types.h" >&5
+echo "configure:5616: checking for boolean_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_sys_types_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5619 "configure"
+#line 5621 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
@@ -5622,7 +5624,7 @@
 boolean_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:5626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_boolean_t_sys_types_h=yes
 else
@@ -5643,12 +5645,12 @@
 fi
 
 echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6
-echo "configure:5647: checking for boolean_t in pthread.h" >&5
+echo "configure:5649: checking for boolean_t in pthread.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_pthread_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5652 "configure"
+#line 5654 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -5655,7 +5657,7 @@
 boolean_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:5659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_boolean_t_pthread_h=yes
 else
@@ -5676,12 +5678,12 @@
 fi
 
 echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6
-echo "configure:5680: checking for boolean_t in cthreads.h" >&5
+echo "configure:5682: checking for boolean_t in cthreads.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_cthreads_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5685 "configure"
+#line 5687 "configure"
 #include "confdefs.h"
 #include <cthreads.h>
 int main() {
@@ -5688,7 +5690,7 @@
 boolean_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:5692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_boolean_t_cthreads_h=yes
 else
@@ -5715,17 +5717,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5719: checking for $ac_hdr" >&5
+echo "configure:5721: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5724 "configure"
+#line 5726 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5758,17 +5760,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5762: checking for $ac_hdr" >&5
+echo "configure:5764: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5767 "configure"
+#line 5769 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5794,17 +5796,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5798: checking for $ac_hdr" >&5
+echo "configure:5800: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5803 "configure"
+#line 5805 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5834,7 +5836,7 @@
   LINUX_DVD_STRUCT=0
   OPENBSD_DVD_STRUCT=0
         cat > conftest.$ac_ext <<EOF
-#line 5838 "configure"
+#line 5840 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -5847,7 +5849,7 @@
 EOF
 
     cat > conftest.$ac_ext <<EOF
-#line 5851 "configure"
+#line 5853 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -5867,7 +5869,7 @@
 rm -f conftest*
 
         cat > conftest.$ac_ext <<EOF
-#line 5871 "configure"
+#line 5873 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -5880,7 +5882,7 @@
 EOF
 
     cat > conftest.$ac_ext <<EOF
-#line 5884 "configure"
+#line 5886 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -5900,7 +5902,7 @@
 rm -f conftest*
 
         cat > conftest.$ac_ext <<EOF
-#line 5904 "configure"
+#line 5906 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -5919,7 +5921,7 @@
 
         NEED_BSDI_LIBDVD=0
   cat > conftest.$ac_ext <<EOF
-#line 5923 "configure"
+#line 5925 "configure"
 #include "confdefs.h"
 #include <dvd.h>
 EOF
@@ -5941,17 +5943,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5945: checking for $ac_hdr" >&5
+echo "configure:5947: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5950 "configure"
+#line 5952 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5991,17 +5993,17 @@
 
         ac_safe=`echo "sys/scsi/scsi_types.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi/scsi_types.h""... $ac_c" 1>&6
-echo "configure:5995: checking for sys/scsi/scsi_types.h" >&5
+echo "configure:5997: checking for sys/scsi/scsi_types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6000 "configure"
+#line 6002 "configure"
 #include "confdefs.h"
 #include <sys/scsi/scsi_types.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6020,17 +6022,17 @@
   
     ac_safe=`echo "sys/scsi/impl/uscsi.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi/impl/uscsi.h""... $ac_c" 1>&6
-echo "configure:6024: checking for sys/scsi/impl/uscsi.h" >&5
+echo "configure:6026: checking for sys/scsi/impl/uscsi.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6029 "configure"
+#line 6031 "configure"
 #include "confdefs.h"
 #include <sys/scsi/impl/uscsi.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6063,17 +6065,17 @@
 
         ac_safe=`echo "sys/scsi.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi.h""... $ac_c" 1>&6
-echo "configure:6067: checking for sys/scsi.h" >&5
+echo "configure:6069: checking for sys/scsi.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6072 "configure"
+#line 6074 "configure"
 #include "confdefs.h"
 #include <sys/scsi.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6091,7 +6093,7 @@
   echo "$ac_t""yes" 1>&6
   
     cat > conftest.$ac_ext <<EOF
-#line 6095 "configure"
+#line 6097 "configure"
 #include "confdefs.h"
 #include <sys/scsi.h>
 EOF
@@ -6114,17 +6116,17 @@
 
         ac_safe=`echo "IOKit/storage/IODVDMediaBSDClient.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for IOKit/storage/IODVDMediaBSDClient.h""... $ac_c" 1>&6
-echo "configure:6118: checking for IOKit/storage/IODVDMediaBSDClient.h" >&5
+echo "configure:6120: checking for IOKit/storage/IODVDMediaBSDClient.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6123 "configure"
+#line 6125 "configure"
 #include "confdefs.h"
 #include <IOKit/storage/IODVDMediaBSDClient.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6177,11 +6179,6 @@
 
 
 CFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DDVDCSS_DIST $CFLAGS"
-
-if test x$SYS = xdarwin
-then
-  CFLAGS="${CFLAGS} -no-cpp-precomp"
-fi
 
 
 
--- a/configure.in
+++ b/configure.in
@@ -20,14 +20,13 @@
 dnl  Check the operating system
 dnl
 case x"${target_os}" in
-  x)
-    SYS=unknown
-    ;;
   xdarwin*)
-    SYS=darwin
+    CFLAGS="${CFLAGS} -no-cpp-precomp"
     ;;
+  xbeos*)
+    AC_DEFINE(SYS_BEOS, 1, Have a BeOS system.)
+    ;;
   x*)
-    SYS=${target_os}
     ;;
 esac
 
@@ -163,11 +162,6 @@
 ])
 
 CFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DDVDCSS_DIST $CFLAGS"
-
-if test x$SYS = xdarwin
-then
-  CFLAGS="${CFLAGS} -no-cpp-precomp"
-fi
 
 AC_SUBST(EXTRA_SRC)
 AC_SUBST(EXTRA_LIB)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -45,6 +45,9 @@
 /* Version number of package */
 #undef VERSION
 
+/* Have a BeOS system. */
+#undef SYS_BEOS
+
 /* Define if <sys/types.h> defines boolean_t. */
 #undef BOOLEAN_T_IN_SYS_TYPES_H
 
--- a/src/ioctl.c
+++ b/src/ioctl.c
@@ -2,7 +2,7 @@
  * ioctl.c: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ioctl.c,v 1.4 2002/04/03 23:02:20 jlj Exp $
+ * $Id: ioctl.c,v 1.5 2002/04/04 01:26:54 sam Exp $
  *
  * Authors: Markus Kuespert <[email protected]>
  *          Samuel Hocevar <[email protected]>
@@ -249,8 +249,7 @@
     i_ret = 0;
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;
@@ -405,8 +404,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;
@@ -553,8 +551,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
 
@@ -667,8 +664,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;
@@ -790,8 +786,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;
@@ -914,8 +909,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;
@@ -1032,8 +1026,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;
@@ -1134,8 +1127,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;
@@ -1256,8 +1248,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    return -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;
@@ -1378,8 +1369,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;
@@ -1487,8 +1477,7 @@
     }
 
 #else
-    /* DVD ioctls unavailable - do as if the ioctl failed */
-    i_ret = -1;
+#   error "DVD ioctls are unavailable on this system"
 
 #endif
     return i_ret;