Changeset 1c26af817b48a27bb587541e9d1e024ab76a25cf

Timestamp:

04/27/02 01:32:23 (6 years ago)

Author:

Johan Bilien <jobi@videolan.org>

git-committer:

Johan Bilien <jobi@videolan.org> 1019863943 +0000

git-parent:

[a48441c66ea2c3d5d53d1c0a98151662c91f694d]

git-author:

Johan Bilien <jobi@videolan.org> 1019863943 +0000

Message:

* plugins/vcd/cdrom_tools : FreeBSD 4.5 port of the vcd input.

Files:

• configure (modified) (53 diffs)
• configure.in (modified) (1 diff)
• plugins/vcd/cdrom_tools.c (modified) (6 diffs)

configure

@@ -6063 +6063 @@
-
-
+  if test "x${SYS}" = "xfreebsd4.5"
+  then
+    PLUGINS="${PLUGINS} vcd"
+  fi
+  
-  if test "x${SYS}" = "xbsdi"
-  then
@@ -6086 +6091 @@
-
-echo $ac_n "checking for inet_pton""... $ac_c" 1>&6
-89
+94
-if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-4
+9
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -6114 +6119 @@
-; return 0; }
-EOF
-17
+22
-  rm -rf conftest*
-  eval "ac_cv_func_inet_pton=yes"
@@ -6181 +6186 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-4
+9
-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
-89
+94
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-4
+9
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -6221 +6226 @@
-
-  echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6
-4
+9
-ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -6229 +6234 @@
-LIBS="-lmad  $LIBS"
-cat > conftest.$ac_ext <<EOF
-2
+7
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -6240 +6245 @@
-; return 0; }
-EOF
-3
+8
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -6293 +6298 @@
-  else
-    echo $ac_n "checking for libavcodec.a in ${with_ffmpeg_tree}""... $ac_c" 1>&6
-296
+301
-    real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`"
-    if test "x$real_ffmpeg_tree" = x
@@ -6331 +6336 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-4
+9
-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
-39
+44
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-4
+9
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -6384 +6389 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-87
+92
-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
-2
+7
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-397
+402
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -6452 +6457 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-55
+60
-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
-0
+5
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-65
+70
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -6515 +6520 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-18
+23
-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
-3
+8
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-28
+33
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -6549 +6554 @@
-    CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
-    echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6
-2
+7
-ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -6557 +6562 @@
-LIBS="-lXv_pic  $LIBS"
-cat > conftest.$ac_ext <<EOF
-0
+5
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -6568 +6573 @@
-; return 0; }
-EOF
-1
+6
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -6626 +6631 @@
-set dummy sdl12-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-29
+34
-if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6666 +6671 @@
-set dummy sdl11-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-69
+74
-if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6707 +6712 @@
-set dummy sdl-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-0
+5
-if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6752 +6757 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-55
+60
-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
-0
+5
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-65
+70
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -6832 +6837 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-35
+40
-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
-0
+5
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-45
+50
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -6871 +6876 @@
-    else
-      echo $ac_n "checking for directX headers in ${with_directx}""... $ac_c" 1>&6
-4
+9
-      if test -f ${with_directx}/ddraw.h
-      then
@@ -6898 +6903 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-1
+6
-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
-06
+11
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-1
+6
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -7003 +7008 @@
-  ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for aalib.h""... $ac_c" 1>&6
-06
+11
-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
-1
+6
-#include "confdefs.h"
-#include <aalib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-16
+21
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -7064 +7069 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-67
+72
-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
-2
+7
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-77
+82
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -7097 +7102 @@
-    PLUGINS="${PLUGINS} dsp"
-    echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-0
+5
-ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -7105 +7110 @@
-LIBS="-lossaudio  $LIBS"
-cat > conftest.$ac_ext <<EOF
-08
+13
-#include "confdefs.h"
-
@@ -7112 +7117 @@
-; return 0; }
-EOF
-15
+20
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -7148 +7153 @@
-set dummy esd-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-1
+6
-if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7199 +7204 @@
-set dummy artsc-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-2
+7
-if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7249 +7254 @@
-     ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
-2
+7
-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
-57
+62
-#include "confdefs.h"
-#include <alsa/asoundlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-2
+7
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -7276 +7281 @@
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-79
+84
-ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -7284 +7289 @@
-LIBS="-lasound  $LIBS"
-cat > conftest.$ac_ext <<EOF
-87
+92
-#include "confdefs.h"
-
@@ -7291 +7296 @@
-; return 0; }
-EOF
-4
+9
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -7368 +7373 @@
-set dummy gtk12-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-1
+6
-if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7407 +7412 @@
-set dummy gtk-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-0
+5
-if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7456 +7461 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-59
+64
-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
-4
+9
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-69
+74
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -7512 +7517 @@
-set dummy gnome-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-15
+20
-if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7556 +7561 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-59
+64
-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
-4
+9
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-69
+74
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -7655 +7660 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-58
+63
-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
-3
+8
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-68
+73
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -7710 +7715 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-3
+8
-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
-18
+23
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-3
+8
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -7791 +7796 @@
-  ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6
-4
+9
-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
-799
+804
-#include "confdefs.h"
-#include <lirc/lirc_client.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-4
+9
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -7818 +7823 @@
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6
-1
+6
-ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -7826 +7831 @@
-LIBS="-llirc_client  $LIBS"
-cat > conftest.$ac_ext <<EOF
-29
+34
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -7837 +7842 @@
-; return 0; }
-EOF
-0
+5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -7892 +7897 @@
-    *)
-                  echo $ac_n "checking whether the byte order is big-endian""... $ac_c" 1>&6
-895
+900
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7966 +7971 @@
-   if test "x$enable_pth" = "xyes"; then
-    echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6
-69
+74
-ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -7974 +7979 @@
-LIBS="-lpth  $LIBS"
-cat > conftest.$ac_ext <<EOF
-77
+82
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -7985 +7990 @@
-; return 0; }
-EOF
-88
+93
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -8013 +8018 @@
-
-    cat > conftest.$ac_ext <<EOF
-16
+21
-#include "confdefs.h"
-#include <pth.h>
@@ -8039 +8044 @@
-   if test "x$enable_st" = "xyes"; then
-    echo $ac_n "checking for st_init in -lst""... $ac_c" 1>&6
-2
+7
-ac_lib_var=`echo st'_'st_init | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -8047 +8052 @@
-LIBS="-lst  $LIBS"
-cat > conftest.$ac_ext <<EOF
-0
+5
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -8058 +8063 @@
-; return 0; }
-EOF
-1
+6
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -8086 +8091 @@
-
-    cat > conftest.$ac_ext <<EOF
-89
+94
-#include "confdefs.h"
-#include <st.h>

configure.in

@@ -722 +722 @@
-  ])
-
+  if test "x${SYS}" = "xfreebsd4.5"
+  then
+    PLUGINS="${PLUGINS} vcd"
+  fi
+  
-  if test "x${SYS}" = "xbsdi"
-  then

plugins/vcd/cdrom_tools.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-2 2002/04/04 05:08:05 sam
+3 2002/04/26 23:32:23 jobi
- *
- * Author: Johan Bilien <jobi@via.ecp.fr>
@@ -42 +42 @@
-#include <sys/ioctl.h>
-
-SYS_BSDI
+ SYS_BSDI 
-#   include <dvd.h>
-#elif defined ( SYS_DARWIN )
@@ -50 +50 @@
-#   include <IOKit/storage/IOCDMedia.h>
-#   include <IOKit/storage/IOCDMediaBSDClient.h>
+#elif defined( SYS_FREEBSD4_5 )
+#   include <sys/cdio.h>
+#   include <sys/cdrio.h>
-#else
-#   include <linux/cdrom.h>
@@ -90 +93 @@
-    freeTOC( pTOC );
-
+#elif defined( SYS_FREEBSD4_5 )
+    struct ioc_toc_header tochdr;
+    
+    if( ioctl( i_fd, CDIOREADTOCHEADER, &tochdr ) == -1 )
+    {
+        intf_ErrMsg( "vcd error: could not read TOCHDR" );
+        return -1;
+    }
+
+    i_count = tochdr.ending_track - tochdr.starting_track + 1;
+    
-#else
-    struct cdrom_tochdr   tochdr;
@@ -168 +182 @@
-    freeTOC( pTOC );
-
+#elif defined( SYS_FREEBSD4_5 )
+    struct ioc_read_toc_entry toc_entries;
+
+    i_tracks = ioctl_GetTrackCount( i_fd, psz_dev );
+    p_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+    if( p_sectors == NULL )
+    {
+        intf_ErrMsg( "vcd error: could not allocate p_sectors" );
+        return NULL;
+    }
+
+    toc_entries.address_format = CD_LBA_FORMAT;
+    toc_entries.starting_track = 0;
+    toc_entries.data_len = ( i_tracks + 1 ) * sizeof( struct cd_toc_entry ); 
+    toc_entries.data = (struct cd_toc_entry *) malloc( toc_entries.data_len );
+    if( toc_entries.data == NULL )
+    {
+        intf_ErrMsg( "vcd error: not enoug memory" );
+        free( p_sectors );
+        return NULL;
+    }
+ 
+    /* Read the TOC */
+    if( ioctl( i_fd, CDIOREADTOCENTRYS, &toc_entries ) == -1 )
+    {
+        intf_ErrMsg( "vcd error: could not read the TOC" );
+        free( p_sectors );
+        free( toc_entries.data );
+        return NULL;
+    }
+    
+    /* Fill the p_sectors structure with the track/sector matches */
+    for( i = 0 ; i <= i_tracks ; i++ )
+    {
+        p_sectors[ i ] = ntohl( toc_entries.data[i].addr.lba );
+    }
-#else
-    struct cdrom_tochdr   tochdr;
@@ -233 +283 @@
-    {
-        intf_ErrMsg( "vcd error: could not read block %d", i_sector );
+        return( -1 );
+    }
+
+#elif defined( SYS_FREEBSD4_5 )
+    
+    int i_size = VCD_SECTOR_SIZE;
+
+    if( ioctl( i_fd, CDRIOCSETBLOCKSIZE, &i_size ) == -1 )
+    {
+        intf_ErrMsg( "vcd error: Could not set block size" );
+        return( -1 );
+    }
+
+    if( lseek( i_fd, i_sector * VCD_SECTOR_SIZE, SEEK_SET ) == -1 )
+    {
+        intf_ErrMsg( "vcd error: Could not lseek to sector %d", i_sector );
+        return( -1 );
+    }
+
+    if( read( i_fd, p_block, VCD_SECTOR_SIZE ) == -1 )
+    {
+        intf_ErrMsg( "vcd error: Could not read sector %d", i_sector );
-        return( -1 );
-    }