Changeset 8ae3a0a26b08421cb76611e053951784bd9106d2

Show
Ignore:
Timestamp:
06/28/08 01:32:50 (2 months ago)
Author:
Jean-Baptiste Kempf <jb@altair.videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@altair.videolan.org> 1214609570 +0200
git-parent:

[3c67532fc931b1feddf628264e1edc8ad01a8ee6]

git-author:
Jean-Baptiste Kempf <jb@altair.videolan.org> 1214609570 +0200
Message:

Use libdvdread fork on the libdvdnav SVN.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Makefile

    r3c67532 r8ae3a0a  
    11681168# *************************************************************************** 
    11691169 
    1170 libdvdread-$(LIBDVDREAD_VERSION).tar.gz: 
    1171     $(WGET) $(LIBDVDREAD_URL) 
    1172  
    1173 libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.gz 
    1174     $(EXTRACT_GZ) 
     1170 
     1171libdvdread:  
     1172    $(SVN) co $(LIBDVDREAD_SVN)  libdvdread 
     1173    (cd $@; patch  -p 0 < ../Patches/libdvdread.patch) 
    11751174#ifdef HAVE_WIN32 
    1176     patch  -p 0 < Patches/libdvdread-win32.patch 
    1177     (cd $@; ./bootstrap ) 
     1175    (cd $@; patch  -p 0 < ../Patches/libdvdread-win32.patch) 
    11781176#endif 
     1177    (cd $@; sh autogen.sh) 
    11791178 
    11801179.libdvdread: libdvdread .dvdcss 
    …… 
    11851184CLEAN_FILE += .libdvdread 
    11861185CLEAN_PKG += libdvdread 
    1187 DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz 
     1186#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz 
    11881187 
    11891188# *************************************************************************** 
    …… 
    24442443    patch -d schroedinger -p1 < Patches/libschroedinger-fix-build-OSX-test.patch 
    24452444 
    2446 .schroedinger: .liboil schroedinger 
     2445.schroedinger: schroedinger .liboil 
    24472446    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) 
    24482447    touch $@ 

  • extras/contrib/src/Patches/libdvdread-win32.patch

    rcc13469 r8ae3a0a  
    1 --- libdvdread/configure.in 2006-10-06 10:12:31.000000000 +0200 
    2 +++ libdvdread.new/configure.in 2008-06-12 06:42:29.000000000 +0200 
    3 @@ -16,7 +16,7 @@ 
    4      AC_DEFINE(__DARWIN__, 1, Have a Mac OS X system) 
    5      ;; 
    6    x*mingw32* | x*cygwin*) 
    7 -    CFLAGS="${CFLAGS} -Dssize_t=long" 
    8 +    CFLAGS="${CFLAGS}" 
    9      ;; 
    10    x*) 
    11      ;; 
    12 @@ -102,6 +102,11 @@ 
    13        [ ], 
    14        AC_MSG_ERROR(You need libdvdcss (dvdcss.h)) 
    15      ) 
    16 +    case "x${host}" in 
    17 +    x*mingw32* | x*cygwin*) 
    18 +    CSS_LIBS=-ldvdcss 
    19 +    ;; 
    20 +    x*) 
    21      AC_MSG_CHECKING([for dvdcss_interface_2 in -ldvdcss]) 
    22      saved_LDFLAGS=$LDFLAGS 
    23      LDFLAGS="$LDFLAGS -ldvdcss" 
    24 @@ -113,6 +118,8 @@ 
    25          ] ) 
    26      LDFLAGS=$saved_LDFLAGS 
    27      AC_MSG_RESULT([yes]) 
    28 +    ;; 
    29 +    esac 
    30    else 
    31      dnl -w added to shutup GCC3.1's cpp warning about -I/usr/local 
    32      saved_CPPFLAGS=$CPPFLAGS 
    33 @@ -124,6 +131,12 @@ 
    34      CPPFLAGS=$saved_CPPFLAGS 
    35      saved_CFLAGS=$CFLAGS 
    36 -    CFLAGS="$CFLAGS -I$dvdcss_include -L$dvdcss_lib -ldvdcss" 
    37 +    CFLAGS="$CFLAGS -I$dvdcss_include " 
    38 +    case "x${host}" in 
    39 +    x*mingw32* | x*cygwin*) 
    40 +    CSS_LIBS="-L$dvdcss_path/lib -R$dvdcss_path/lib -ldvdcss" 
    41 +    CSS_CFLAGS=-I$dvdcss_path/include 
    42 +    ;; 
    43 +    x*) 
    44      AC_MSG_CHECKING([for dvdcss_interface_2 in -ldvdcss]) 
    45      AC_TRY_LINK([#include <dvdcss/dvdcss.h>],  
    46                  [if(!dvdcss_interface_2) { return 1; }], 
    47 @@ -134,6 +147,8 @@ 
    48          ] ) 
    49      CFLAGS=$saved_CFLAGS 
    50      AC_MSG_RESULT([yes]) 
    51 +    ;; 
    52 +    esac 
    53    fi 
    54  fi 
     1Index: src/dvd_reader.c 
     2=================================================================== 
     3--- src/dvd_reader.c    (revision 1107) 
     4+++ src/dvd_reader.c    (working copy) 
     5@@ -32,6 +32,7 @@ 
     6 #include <limits.h> 
     7 #include <dirent.h> 
    558  
    56 --- libdvdread/dvdread/dvd_reader.c 2006-10-06 09:58:03.000000000 +0200 
    57 +++ libdvdread.new/dvdread/dvd_reader.c 2008-06-12 06:42:28.000000000 +0200 
    58 @@ -182,7 +182,7 @@ 
    59   
    60    dev->align = align; 
    61  } 
    62 - 
    639+#if 0 
    64  #ifdef WIN32 /* replacement gettimeofday implementation */ 
    65  #include <sys/timeb.h> 
    66  static int gettimeofday( struct timeval *tv, void *tz ) 
    67 @@ -194,7 +194,7 @@ 
    68    return 0; 
    69  } 
     10 /* misc win32 helpers */ 
     11 #ifdef WIN32 
     12 #ifndef HAVE_GETTIMEOFDAY 
     13@@ -50,7 +51,8 @@ 
     14 #include <io.h> /* read() */ 
     15 #define lseek64 _lseeki64 
    7016 #endif 
    71 - 
     17-  
    7218+#endif 
    73   
    74  /* Loop over all titles and call dvdcss_title to crack the keys. */ 
    75  static int initAllCSSKeys( dvd_reader_t *dvd ) 
     19+ 
     20 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) 
     21 #define SYS_BSD 1 
     22 #endif 

  • extras/contrib/src/packages.mak

    r3c67532 r8ae3a0a  
    110110LIBDVDNAV_URL=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz 
    111111LIBDVDNAV_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav 
     112LIBDVDREAD_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread 
    112113LIBDVDREAD_VERSION=0.9.7 
    113114LIBDVDREAD_URL=http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-$(LIBDVDREAD_VERSION).tar.gz