Commit 8ae3a0a2 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Use libdvdread fork on the libdvdnav SVN.

parent 3c67532f
......@@ -1167,15 +1167,14 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
# libdvdread: We use dvdnav's dvdread
# ***************************************************************************
libdvdread-$(LIBDVDREAD_VERSION).tar.gz:
$(WGET) $(LIBDVDREAD_URL)
libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.gz
$(EXTRACT_GZ)
libdvdread:
$(SVN) co $(LIBDVDREAD_SVN) libdvdread
(cd $@; patch -p 0 < ../Patches/libdvdread.patch)
#ifdef HAVE_WIN32
patch -p 0 < Patches/libdvdread-win32.patch
(cd $@; ./bootstrap )
(cd $@; patch -p 0 < ../Patches/libdvdread-win32.patch)
#endif
(cd $@; sh autogen.sh)
.libdvdread: libdvdread .dvdcss
(cd libdvdread; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
......@@ -1184,7 +1183,7 @@ libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.gz
CLEAN_FILE += .libdvdread
CLEAN_PKG += libdvdread
DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
# ***************************************************************************
# libdvdnav
......@@ -2443,7 +2442,7 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
patch -d schroedinger -p1 < Patches/libschroedinger-fix-build-OSX.patch
patch -d schroedinger -p1 < Patches/libschroedinger-fix-build-OSX-test.patch
.schroedinger: .liboil schroedinger
.schroedinger: schroedinger .liboil
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
touch $@
......
--- libdvdread/configure.in 2006-10-06 10:12:31.000000000 +0200
+++ libdvdread.new/configure.in 2008-06-12 06:42:29.000000000 +0200
@@ -16,7 +16,7 @@
AC_DEFINE(__DARWIN__, 1, Have a Mac OS X system)
;;
x*mingw32* | x*cygwin*)
- CFLAGS="${CFLAGS} -Dssize_t=long"
+ CFLAGS="${CFLAGS}"
;;
x*)
;;
@@ -102,6 +102,11 @@
[ ],
AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
)
+ case "x${host}" in
+ x*mingw32* | x*cygwin*)
+ CSS_LIBS=-ldvdcss
+ ;;
+ x*)
AC_MSG_CHECKING([for dvdcss_interface_2 in -ldvdcss])
saved_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -ldvdcss"
@@ -113,6 +118,8 @@
] )
LDFLAGS=$saved_LDFLAGS
AC_MSG_RESULT([yes])
+ ;;
+ esac
else
dnl -w added to shutup GCC3.1's cpp warning about -I/usr/local
saved_CPPFLAGS=$CPPFLAGS
@@ -124,6 +131,12 @@
CPPFLAGS=$saved_CPPFLAGS
saved_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -I$dvdcss_include -L$dvdcss_lib -ldvdcss"
+ CFLAGS="$CFLAGS -I$dvdcss_include "
+ case "x${host}" in
+ x*mingw32* | x*cygwin*)
+ CSS_LIBS="-L$dvdcss_path/lib -R$dvdcss_path/lib -ldvdcss"
+ CSS_CFLAGS=-I$dvdcss_path/include
+ ;;
+ x*)
AC_MSG_CHECKING([for dvdcss_interface_2 in -ldvdcss])
AC_TRY_LINK([#include <dvdcss/dvdcss.h>],
[if(!dvdcss_interface_2) { return 1; }],
@@ -134,6 +147,8 @@
] )
CFLAGS=$saved_CFLAGS
AC_MSG_RESULT([yes])
+ ;;
+ esac
fi
fi
Index: src/dvd_reader.c
===================================================================
--- src/dvd_reader.c (revision 1107)
+++ src/dvd_reader.c (working copy)
@@ -32,6 +32,7 @@
#include <limits.h>
#include <dirent.h>
--- libdvdread/dvdread/dvd_reader.c 2006-10-06 09:58:03.000000000 +0200
+++ libdvdread.new/dvdread/dvd_reader.c 2008-06-12 06:42:28.000000000 +0200
@@ -182,7 +182,7 @@
dev->align = align;
}
-
+#if 0
#ifdef WIN32 /* replacement gettimeofday implementation */
#include <sys/timeb.h>
static int gettimeofday( struct timeval *tv, void *tz )
@@ -194,7 +194,7 @@
return 0;
}
/* misc win32 helpers */
#ifdef WIN32
#ifndef HAVE_GETTIMEOFDAY
@@ -50,7 +51,8 @@
#include <io.h> /* read() */
#define lseek64 _lseeki64
#endif
-
-
+#endif
/* Loop over all titles and call dvdcss_title to crack the keys. */
static int initAllCSSKeys( dvd_reader_t *dvd )
+
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
#define SYS_BSD 1
#endif
......@@ -109,6 +109,7 @@ LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_V
LIBDVDNAV_VERSION=4.1.1
LIBDVDNAV_URL=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
LIBDVDNAV_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
LIBDVDREAD_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
LIBDVDREAD_VERSION=0.9.7
LIBDVDREAD_URL=http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
#LIBDVDREAD_URL=$(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment