libmpdvdkit2/libdvdread_changes.diff

   1 diff -Naur dvdread.orig/bswap.h dvdread/bswap.h
   2 --- dvdread.orig/bswap.h        2005-06-23 00:18:54.000000000 +0200
   3 +++ dvdread/bswap.h     2005-06-23 00:19:10.000000000 +0200
   4 @@ -20,8 +24,6 @@
   5   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   6   */
   7
   8 -#include <config.h>
   9 -
  10  #if defined(WORDS_BIGENDIAN)
  11  /* All bigendian systems are fine, just ignore the swaps. */
  12  #define B2N_16(x) (void)(x)
  13 @@ -59,13 +61,57 @@
  14  #define B2N_32(x) x = be32toh(x)
  15  #define B2N_64(x) x = be64toh(x)
  16
  17 +#elif defined(__DragonFly__)
  18 +#include <sys/endian.h>
  19 +#define B2N_16(x) x = be16toh(x)
  20 +#define B2N_32(x) x = be32toh(x)
  21 +#define B2N_64(x) x = be64toh(x)
  22 +
  23 +#elif defined(ARCH_X86)
  24 +inline static unsigned short bswap_16(unsigned short x)
  25 +{
  26 +  __asm("xchgb %b0,%h0" :
  27 +        "=q" (x)        :
  28 +        "0" (x));
  29 +    return x;
  30 +}
  31 +#define B2N_16(x) x = bswap_16(x)
  32 +
  33 +inline static unsigned int bswap_32(unsigned int x)
  34 +{
  35 + __asm(
  36 +#if __CPU__ > 386
  37 +      "bswap   %0":
  38 +      "=r" (x)     :
  39 +#else
  40 +      "xchgb   %b0,%h0\n"
  41 +      " rorl    $16,%0\n"
  42 +      " xchgb   %b0,%h0":
  43 +      "=q" (x)          :
  44 +#endif
  45 +      "0" (x));
  46 +  return x;
  47 +}
  48 +#define B2N_32(x) x = bswap_32(x)
  49 +
  50 +inline static unsigned long long int bswap_64(unsigned long long int x)
  51 +{
  52 +  register union { __extension__ uint64_t __ll;
  53 +          uint32_t __l[2]; } __x;
  54 +  asm("xchgl    %0,%1":
  55 +      "=r"(__x.__l[0]),"=r"(__x.__l[1]):
  56 +      "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32))));
  57 +  return __x.__ll;
  58 +}
  59 +#define B2N_64(x) x = bswap_64(x)
  60 +
  61  /* This is a slow but portable implementation, it has multiple evaluation
  62   * problems so beware.
  63   * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such
  64   * functionality!
  65   */
  66
  67 -#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__)
  68 +#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__CYGWIN__)
  69  #define B2N_16(x) \
  70   x = ((((x) & 0xff00) >> 8) | \
  71        (((x) & 0x00ff) << 8))
  72 diff -Naur dvdread.orig/.cvsignore dvdread/.cvsignore
  73 diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c
  74 --- dvdread.orig/dvd_input.c    2005-06-23 00:18:54.000000000 +0200
  75 +++ dvdread/dvd_input.c 2005-06-23 00:30:23.000000000 +0200
  76 @@ -37,7 +41,7 @@
  77
  78  #ifdef HAVE_DVDCSS_DVDCSS_H
  79  /* linking to libdvdcss */
  80 -#include <dvdcss/dvdcss.h>
  81 +#include "dvdcss.h"
  82  #define DVDcss_open(a) dvdcss_open((char*)(a))
  83  #define DVDcss_close   dvdcss_close
  84  #define DVDcss_seek    dvdcss_seek
  85 @@ -74,7 +78,7 @@
  86    dvd_input_t dev;
  87
  88    /* Allocate the handle structure */
  89 -  dev = (dvd_input_t) malloc(sizeof(dvd_input_t));
  90 +  dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s));
  91    if(dev == NULL) {
  92      fprintf(stderr, "libdvdread: Could not allocate memory.\n");
  93      return NULL;
  94 @@ -320,8 +324,10 @@
  95      fprintf(stderr, "DVDCSS_METHOD %s\n", psz_method);
  96      fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose);
  97      */
  98 +    /*
  99      fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n",
 100             *dvdcss_version);
 101 +    */
 102
 103      /* libdvdcss wrapper functions */
 104      dvdinput_open  = css_open;
 105 diff -Naur dvdread.orig/dvd_input.h dvdread/dvd_input.h
 106 diff -Naur dvdread.orig/dvd_reader.c dvdread/dvd_reader.c
 107 --- dvdread.orig/dvd_reader.c   2005-06-23 00:18:54.000000000 +0200
 108 +++ dvdread/dvd_reader.c        2005-06-23 00:19:10.000000000 +0200
 109 @@ -32,24 +36,36 @@
 110  #include <limits.h>
 111  #include <dirent.h>
 112
 113 -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
 114 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__)
 115  #define SYS_BSD 1
 116  #endif
 117
 118  #if defined(__sun)
 119  #include <sys/mnttab.h>
 120 +#elif defined(hpux)
 121 +#include </usr/conf/h/mnttab.h>
 122  #elif defined(SYS_BSD)
 123  #include <fstab.h>
 124 -#elif defined(__linux__)
 125 +#elif defined(__linux__) || defined(__CYGWIN__)
 126  #include <mntent.h>
 127  #endif
 128
 129 +#ifdef __MINGW32__
 130 +#include <sys/timeb.h>
 131 +static void gettimeofday(struct timeval* t,void* timezone){
 132 +    struct timeb timebuffer;
 133 +    ftime( &timebuffer );
 134 +    t->tv_sec=timebuffer.time;
 135 +    t->tv_usec=1000*timebuffer.millitm;
 136 +}
 137 +#endif
 138 +
 139  #include "dvd_udf.h"
 140  #include "dvd_input.h"
 141  #include "dvd_reader.h"
 142  #include "md5.h"
 143
 144 -#define DEFAULT_UDF_CACHE_LEVEL 1
 145 +#define DEFAULT_UDF_CACHE_LEVEL 0
 146
 147  struct dvd_reader_s {
 148      /* Basic information. */
 149 @@ -194,6 +210,13 @@
 150  }
 151
 152
 153 +#ifndef HAVE_MPLAYER
 154 + #include "get_path.c"
 155 +#else
 156 + extern char * get_path( char * filename );
 157 +#endif
 158 +
 159 +//extern char * dvdcss_cache_dir;
 160
 161  /**
 162   * Open a DVD image or block device file.
 163 @@ -282,7 +305,7 @@
 164      char *new_path;
 165
 166      /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */
 167 -    if( !strncmp( path, "/dev/",  5 ) || strncmp( path, "/dev/r", 6 ) )
 168 +    if( strncmp( path, "/dev/",  5 ) || !strncmp( path, "/dev/r", 6 ) )
 169        return (char *) strdup( path );
 170
 171      /* Replace "/dev/" with "/dev/r" */
 172 @@ -303,6 +326,16 @@
 173      if( path == NULL )
 174        return 0;
 175
 176 +#ifdef WIN32
 177 +    /* Stat doesn't work on devices under mingwin/cygwin. */
 178 +    if( path[0] && path[1] == ':' && path[2] == '\0' )
 179 +    {
 180 +        /* Don't try to stat the file */
 181 +        fileinfo.st_mode = S_IFBLK;
 182 +    }
 183 +    else
 184 +#endif
 185 +    {
 186      ret = stat( path, &fileinfo );
 187      if( ret < 0 ) {
 188         /* If we can't stat the file, give up */
 189 @@ -310,6 +343,7 @@
 190         perror("");
 191         return 0;
 192      }
 193 +    }
 194
 195      /* Try to open libdvdcss or fall back to standard functions */
 196      have_css = dvdinput_setup();
 197 @@ -335,7 +369,7 @@
 198         char *path_copy;
 199  #if defined(SYS_BSD)
 200         struct fstab* fe;
 201 -#elif defined(__sun) || defined(__linux__)
 202 +#elif defined(__sun) || defined(__linux__) || defined(__CYGWIN__)
 203         FILE *mntfile;
 204  #endif
 205
 206 @@ -350,7 +384,9 @@
 207             if( cdir >= 0 ) {
 208                 chdir( path_copy );
 209                 new_path = getcwd( NULL, PATH_MAX );
 210 +#ifndef __MINGW32__
 211                 fchdir( cdir );
 212 +#endif
 213                 close( cdir );
 214                 if( new_path ) {
 215                     free( path_copy );
 216 @@ -406,7 +442,7 @@
 217             }
 218             fclose( mntfile );
 219         }
 220 -#elif defined(__linux__)
 221 +#elif defined(__linux__) || defined(__CYGWIN__)
 222          mntfile = fopen( MOUNTED, "r" );
 223          if( mntfile ) {
 224              struct mntent *me;
 225 @@ -425,6 +461,9 @@
 226              }
 227              fclose( mntfile );
 228         }
 229 +#elif defined(__MINGW32__)
 230 +       dev_name = strdup(path);
 231 +       auth_drive = DVDOpenImageFile( path, have_css );
 232  #endif
 233         if( !dev_name ) {
 234           fprintf( stderr, "libdvdread: Couldn't find device name.\n" );
 235 @@ -615,8 +654,8 @@
 236      }
 237
 238      if( dvd->css_state == 1 /* Need key init */ ) {
 239 -        initAllCSSKeys( dvd );
 240 -       dvd->css_state = 2;
 241 +//        initAllCSSKeys( dvd );
 242 +//     dvd->css_state = 2;
 243      }
 244      /*
 245      if( dvdinput_title( dvd_file->dvd->dev, (int)start ) < 0 ) {
 246 @@ -915,7 +954,7 @@
 247      return (ssize_t)ret;
 248  }
 249
 250 -int32_t DVDFileSeek( dvd_file_t *dvd_file, int32_t offset )
 251 +int DVDFileSeek( dvd_file_t *dvd_file, int offset )
 252  {
 253      /* Check arguments. */
 254      if( dvd_file == NULL || offset < 0 )
 255 diff -Naur dvdread.orig/dvdread_internal.h dvdread/dvdread_internal.h
 256 --- dvdread.orig/dvdread_internal.h     2005-06-23 00:18:54.000000000 +0200
 257 +++ dvdread/dvdread_internal.h  2005-06-23 00:19:10.000000000 +0200
 258 @@ -2,11 +2,7 @@
 259  #define DVDREAD_INTERNAL_H
 260
 261
 262 -#define CHECK_VALUE(arg) \
 263 - if(!(arg)) { \
 264 -   fprintf(stderr, "\n*** libdvdread: CHECK_VALUE failed in %s:%i ***" \
 265 -                   "\n*** for %s ***\n\n", \
 266 -                   __FILE__, __LINE__, # arg ); \
 267 - }
 268 +#define CHECK_VALUE(arg)
 269 +
 270
 271  #endif /* DVDREAD_INTERNAL_H */
 272 diff -Naur dvdread.orig/dvd_udf.c dvdread/dvd_udf.c
 273 --- dvdread.orig/dvd_udf.c      2005-06-23 00:18:54.000000000 +0200
 274 +++ dvdread/dvd_udf.c   2005-06-23 00:19:10.000000000 +0200
 275 @@ -33,7 +37,9 @@
 276  #include <stdio.h>
 277  #include <stdlib.h>
 278  #include <string.h>
 279 +#ifndef __MINGW32__
 280  #include <sys/ioctl.h>
 281 +#endif
 282  #include <sys/types.h>
 283  #include <sys/stat.h>
 284  #include <unistd.h>
 285 diff -Naur dvdread.orig/ifo_print.c dvdread/ifo_print.c
 286 diff -Naur dvdread.orig/ifo_print.h dvdread/ifo_print.h
 287 diff -Naur dvdread.orig/ifo_read.c dvdread/ifo_read.c
 288 diff -Naur dvdread.orig/ifo_read.h dvdread/ifo_read.h
 289 --- dvdread.orig/ifo_read.h     2005-06-23 00:18:54.000000000 +0200
 290 +++ dvdread/ifo_read.h  2005-06-23 00:19:10.000000000 +0200
 291 @@ -20,8 +24,8 @@
 292   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 293   */
 294
 295 -#include <dvdread/ifo_types.h>
 296 -#include <dvdread/dvd_reader.h>
 297 +#include "ifo_types.h"
 298 +#include "dvd_reader.h"
 299
 300  #ifdef __cplusplus
 301  extern "C" {
 302 diff -Naur dvdread.orig/ifo_types.h dvdread/ifo_types.h
 303 --- dvdread.orig/ifo_types.h    2005-06-23 00:18:54.000000000 +0200
 304 +++ dvdread/ifo_types.h 2005-06-23 00:19:10.000000000 +0200
 305 @@ -21,7 +25,7 @@
 306   */
 307
 308  #include <inttypes.h>
 309 -#include <dvdread/dvd_reader.h>
 310 +#include "dvd_reader.h"
 311
 312
 313  #undef ATTRIBUTE_PACKED
 314 diff -Naur dvdread.orig/nav_print.c dvdread/nav_print.c
 315 diff -Naur dvdread.orig/nav_print.h dvdread/nav_print.h
 316 --- dvdread.orig/nav_print.h    2005-06-23 00:18:54.000000000 +0200
 317 +++ dvdread/nav_print.h 2005-06-23 00:19:10.000000000 +0200
 318 @@ -20,7 +24,7 @@
 319   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 320   */
 321
 322 -#include <dvdread/nav_types.h>
 323 +#include "nav_types.h"
 324
 325  /**
 326   * Pretty printing of the NAV packets, PCI and DSI structs.
 327 diff -Naur dvdread.orig/nav_read.c dvdread/nav_read.c
 328 diff -Naur dvdread.orig/nav_read.h dvdread/nav_read.h
 329 --- dvdread.orig/nav_read.h     2005-06-23 00:18:54.000000000 +0200
 330 +++ dvdread/nav_read.h  2005-06-23 00:19:10.000000000 +0200
 331 @@ -19,7 +23,7 @@
 332   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 333   */
 334
 335 -#include <dvdread/nav_types.h>
 336 +#include "nav_types.h"
 337
 338  /**
 339   * Parsing of NAV data, PCI and DSI parts.
 340 diff -Naur dvdread.orig/nav_types.h dvdread/nav_types.h
 341 --- dvdread.orig/nav_types.h    2005-06-23 00:18:54.000000000 +0200
 342 +++ dvdread/nav_types.h 2005-06-23 00:19:10.000000000 +0200
 343 @@ -30,7 +34,7 @@
 344   */
 345
 346  #include <inttypes.h>
 347 -#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
 348 +#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */
 349
 350
 351  #undef ATTRIBUTE_PACKED