git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/libdvdnav.patch

   1 diff --git a/configure.ac b/configure.ac
   2 index e5ee5c4..b381093 100644
   3 --- a/configure.ac
   4 +++ b/configure.ac
   5 @@ -161,25 +166,61 @@ AC_SUBST(THREAD_LIBS)
   6  AC_SUBST(THREAD_CFLAGS)
   7
   8  dnl ---------------------------------------------
   9 -dnl dynamic linker
  10 +dnl dvdcss checking
  11  dnl ---------------------------------------------
  12 -case $host in
  13 -  *mingw32*)
  14 -    CFLAGS="-idirafter \$(top_srcdir)/msvc/include $CFLAGS"
  15 -    LDFLAGS="-no-undefined $LDFLAGS"
  16 -    ;;
  17 -  *cygwin*)
  18 -    LDFLAGS="-no-undefined $LDFLAGS"
  19 -    ;;
  20 -  *)
  21 -    AC_CHECK_LIB(c, dlopen,
  22 -                DYNAMIC_LD_LIBS="",
  23 -                AC_CHECK_LIB(dl, dlopen,
  24 -                             DYNAMIC_LD_LIBS="-ldl",
  25 -                             AC_MSG_ERROR(dynamic linker needed)))
  26 -    AC_SUBST(DYNAMIC_LD_LIBS)
  27 -    ;;
  28 -esac
  29 +AC_ARG_WITH( [libdvdcss],
  30 +    [  --with-libdvdcss[=PATH]    force linking against libdvdcss],
  31 +    [if test x"$withval" != xno; then
  32 +       link_dvdcss=yes
  33 +     fi
  34 +     if test x"$withval" != xyes; then
  35 +       dvdcss_path=$withval
  36 +     fi])
  37 +
  38 +if test x"$link_dvdcss" != xyes; then
  39 +dnl dlopen libdvdcss
  40 +  AC_CHECK_FUNC( dlopen,
  41 +    [DL_LIBS="" ],
  42 +    AC_CHECK_LIB( dl, dlopen,
  43 +      [DL_LIBS=-ld ],
  44 +      AC_MSG_ERROR(You need libdl (dlopen))
  45 +    )
  46 +  )
  47 +else
  48 +dnl link with libdvdcss
  49 +  if test -z "$dvdcss_path"; then
  50 +    AC_CHECK_LIB(dvdcss, dvdcss_interface_2,
  51 +      [ CSS_LIBS=-ldvdcss ],
  52 +      AC_MSG_ERROR(You need libdvdcss.so.2 or later)
  53 +    )
  54 +    AC_CHECK_HEADERS(dvdcss/dvdcss.h,
  55 +      [ ],
  56 +      AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
  57 +    )
  58 +  else
  59 +    saved_CFLAGS=$CFLAGS
  60 +    CFLAGS="$CFLAGS -L$dvdcss_path/lib"
  61 +    AC_CHECK_LIB(dvdcss, dvdcss_interface_2,
  62 +      [ CSS_LIBS="-L$dvdcss_path/lib -R$dvdcss_path/lib -ldvdcss"
  63 +        CSS_CFLAGS=-I$dvdcss_path/include ],
  64 +      AC_MSG_ERROR(You need libdvdcss.so.2 or later)
  65 +    )
  66 +    CFLAGS=$saved_CFLAGS
  67 +    dnl -w added to shutup GCC3.1's cpp warning about -I/usr/local
  68 +    saved_CPPFLAGS=$CPPFLAGS
  69 +    CPPFLAGS="-w $CPPFLAGS -I$dvdcss_path/include"
  70 +    AC_CHECK_HEADERS(dvdcss/dvdcss.h,
  71 +      [ ],
  72 +      AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
  73 +    )
  74 +    CPPFLAGS=$saved_CPPFLAGS
  75 +  fi
  76 +fi
  77 +
  78 +AC_SUBST(DL_LIBS)
  79 +AC_SUBST(CSS_LIBS)
  80 +AC_SUBST(CSS_CFLAGS)
  81 +
  82
  83  dnl ---------------------------------------------
  84  dnl cflags
  85 --- a/examples/Makefile.am.orig 2008-06-10 01:56:16.000000000 +0200
  86 +++ b/examples/Makefile.am      2008-06-10 01:57:04.000000000 +0200
  87 @@ -8,7 +8,7 @@
  88
  89  menus_SOURCES = menus.c
  90  menus_LDFLAGS = -L$(top_srcdir)/src/ -ldvdread
  91 -menus_LDADD   = $(DVDNAV_LIB)
  92 +menus_LDADD   = $(DVDNAV_LIB) $(CSS_LIBS)
  93
  94  $(DVDNAV_LIB):
  95         @cd $(top_builddir)/src/ && $(MAKE) libdvdnav.la
  96 diff --git a/src/vm/vm.c b/src/vm/vm.c
  97 index 53bef88..db855c7 100644
  98 --- a/src/vm/vm.c
  99 +++ b/src/vm/vm.c
 100 @@ -134,24 +134,25 @@ static void vm_print_current_domain_state(vm_t *vm) {
 101  }
 102  #endif
 103
 104 +#include <libdvdread/dvd_input.h>
 105 +
 106  static void dvd_read_name(char *name, const char *device) {
 107      /* Because we are compiling with _FILE_OFFSET_BITS=64
 108       * all off_t are 64bit.
 109       */
 110      off_t off;
 111 -    int fd, i;
 112 +    dvd_input_t fd; int i;
 113      uint8_t data[DVD_VIDEO_LB_LEN];
 114
 115      /* Read DVD name */
 116 -    fd = open(device, O_RDONLY);
 117 +    fd = dvdinput_open(device);
 118      if (fd > 0) {
 119 -      off = lseek( fd, 32 * (off_t) DVD_VIDEO_LB_LEN, SEEK_SET );
 120 -      if( off == ( 32 * (off_t) DVD_VIDEO_LB_LEN ) ) {
 121 -        off = read( fd, data, DVD_VIDEO_LB_LEN );
 122 -        close(fd);
 123 -        if (off == ( (off_t) DVD_VIDEO_LB_LEN )) {
 124 +      off = dvdinput_seek( fd, 16 );
 125 +      if( off == 16 ) {
 126 +        off = dvdinput_read( fd, data, 1, DVDINPUT_NOFLAGS );
 127 +        if (off == 1 ) {
 128            fprintf(MSG_OUT, "libdvdnav: DVD Title: ");
 129 -          for(i=25; i < 73; i++ ) {
 130 +          for(i=40; i < 73; i++ ) {
 131              if((data[i] == 0)) break;
 132              if((data[i] > 32) && (data[i] < 127)) {
 133                fprintf(MSG_OUT, "%c", data[i]);
 134 @@ -159,10 +160,12 @@ static void dvd_read_name(char *name, const char *device) {
 135                fprintf(MSG_OUT, " ");
 136              }
 137            }
 138 -          strncpy(name, (char*) &data[25], 48);
 139 -          name[48] = 0;
 140 +          strncpy(name, (char*) &data[40], 32);
 141 +          i=31;
 142 +          while( (i >= 0) && (name[i] <= ' ')) --i;
 143 +          name[i+1] = '\0';
 144            fprintf(MSG_OUT, "\nlibdvdnav: DVD Serial Number: ");
 145 -          for(i=73; i < 89; i++ ) {
 146 +          for(i=813; i < 829; i++ ) {
 147              if((data[i] == 0)) break;
 148              if((data[i] > 32) && (data[i] < 127)) {
 149                fprintf(MSG_OUT, "%c", data[i]);
 150 @@ -186,7 +189,7 @@ static void dvd_read_name(char *name, const char *device) {
 151        } else {
 152          fprintf(MSG_OUT, "libdvdnav: Can't seek to block %u\n", 32 );
 153        }
 154 -      close(fd);
 155 +      dvdinput_close(fd);
 156      } else {
 157      fprintf(MSG_OUT, "NAME OPEN FAILED\n");
 158    }