[vlc-devel] commit: Fix dvdnav building for win32 (backported from master) ( Rafaël Carré )

[git version control]

vlc | branch: 0.8.6-bugfix | Rafaël Carré <funman at videolan.org> | Tue May 27 02:42:22 2008 +0200| [df0f6c17c879ffc2816bec0bac6db0af8b7abfef]

Fix dvdnav building for win32 (backported from master)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=df0f6c17c879ffc2816bec0bac6db0af8b7abfef
---

 extras/contrib/src/Makefile             |    2 +-
 extras/contrib/src/Patches/dvdnav.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 82558dc..c5fd838 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1069,7 +1069,7 @@ libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
 .dvdnav: libdvdnav .dvdcss
 ifdef HAVE_WIN32	
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -Dssize_t=long" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" && make && make install)
 else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
 endif
diff --git a/extras/contrib/src/Patches/dvdnav.patch b/extras/contrib/src/Patches/dvdnav.patch
index 18fdefd..357606d 100644
--- a/extras/contrib/src/Patches/dvdnav.patch
+++ b/extras/contrib/src/Patches/dvdnav.patch
@@ -341,6 +341,18 @@ diff -ur libdvdnav/src/vm/vm.c libdvdnav.new/src/vm/vm.c
  fi      
 --- libdvdnav/configure.ac	2005-02-11 12:33:19.000000000 +0000
 +++ libdvdnav.new/configure.ac	2005-12-02 15:23:13.921875000 +0000
+@@ -128,7 +128,10 @@
+ AC_TYPE_SIZE_T
+ dnl AC_CHECK_TYPES([ptrdiff_t])
+ AC_C_BIGENDIAN
+-
++dnl ---------------------------------------------
++dnl Check for basic *nix fonction that we may emulate on other OS
++dnl ---------------------------------------------
++AC_CHECK_FUNCS(gettimeofday)
+ dnl ---------------------------------------------
+ dnl threads
+ dnl ---------------------------------------------
 @@ -138,7 +138,7 @@
      THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
      CFLAGS="$THREAD_CFLAGS $CFLAGS"
@@ -461,3 +473,22 @@ diff -ur libdvdnav/src/vm/vm.c libdvdnav.new/src/vm/vm.c
  menus_LDADD   = $(DVDNAV_LIB)
  
  $(DVDNAV_LIB):
+--- libdvdnav/src/dvdnav_internal.h.orig	2007-02-19 18:41:27.784456800 +0000
++++ libdvdnav/src/dvdnav_internal.h	2007-02-19 18:41:50.706478500 +0000
+@@ -45,6 +45,7 @@
+ #define pthread_mutex_unlock(a)  LeaveCriticalSection(a)
+ #define pthread_mutex_destroy(a)
+ 
++#ifndef HAVE_GETTIMEOFDAY
+ /* replacement gettimeofday implementation */
+ #include <sys/timeb.h>
+ static inline int _private_gettimeofday( struct timeval *tv, void *tz )
+@@ -56,6 +57,8 @@
+   return 0;
+ }
+ #define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
++#endif
++
+ #include <io.h> /* read() */
+ #define lseek64 _lseeki64
+