DVDNAV changes:

  improve MinGW support, kFreeBSD support
  define HAVE_* when provided replacement functions in xine-lib

CVS patchset: 8268
CVS date: 2006/09/17 13:01:07

1 files changed, 172 insertions, 0 deletions

diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch
index da00d8fd6..6afca3a98 100644
--- a/src/input/libdvdnav/diff_against_cvs.patch
+++ b/src/input/libdvdnav/diff_against_cvs.patch
@@ -247,3 +247,175 @@ diff -u -r1.2 md5.c
  
  #include "md5.h"
  /* #include "unlocked-io.h" */
+Index: src/input/libdvdnav/bswap.h
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/bswap.h,v
+retrieving revision 1.3
+diff -u -p -u -r1.3 bswap.h
+--- src/input/libdvdnav/bswap.h	26 May 2003 23:11:44 -0000	1.3
++++ src/input/libdvdnav/bswap.h	17 Sep 2006 12:50:16 -0000
+@@ -35,7 +35,7 @@
+ #include <sys/param.h>
+ #endif
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__GLIBC__)
+ #include <byteswap.h>
+ #define B2N_16(x) x = bswap_16(x)
+ #define B2N_32(x) x = bswap_32(x)
+Index: src/input/libdvdnav/dvd_reader.c
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/dvd_reader.c,v
+retrieving revision 1.13
+diff -u -p -u -r1.13 dvd_reader.c
+--- src/input/libdvdnav/dvd_reader.c	15 Jun 2006 14:26:40 -0000	1.13
++++ src/input/libdvdnav/dvd_reader.c	17 Sep 2006 12:50:16 -0000
+@@ -32,8 +32,13 @@
+ #include <limits.h>
+ #include <dirent.h>
+ 
+-/* misc win32 helpers */
+-#ifdef WIN32
++#ifndef HAVE_GETTIMEOFDAY
++#  ifdef WIN32
++#    include <winsock.h>
++struct timezone;
++#  else
++#    include <sys/time.h>
++#  endif
+ /* replacement gettimeofday implementation */
+ #include <sys/timeb.h>
+ static inline int _private_gettimeofday( struct timeval *tv, void *tz )
+@@ -45,6 +50,10 @@ static inline int _private_gettimeofday(
+   return 0;
+ }
+ #define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
++#endif
++
++/* misc win32 helpers */
++#ifdef WIN32
+ #include <io.h> /* read() */
+ #define lseek64 _lseeki64
+ #endif
+Index: src/input/libdvdnav/dvd_reader.h
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/dvd_reader.h,v
+retrieving revision 1.5
+diff -u -p -u -r1.5 dvd_reader.h
+--- src/input/libdvdnav/dvd_reader.h	16 Mar 2004 11:43:38 -0000	1.5
++++ src/input/libdvdnav/dvd_reader.h	17 Sep 2006 12:50:16 -0000
+@@ -21,9 +21,11 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-#ifdef _MSC_VER
++#ifdef HAVE_CONFIG_H
+ #include <config.h>
++#endif
+ 
++#ifdef _MSC_VER
+ #include <stdio.h>
+ #include <stdlib.h>
+ #endif
+Index: src/input/libdvdnav/dvdnav_internal.h
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/dvdnav_internal.h,v
+retrieving revision 1.15
+diff -u -p -u -r1.15 dvdnav_internal.h
+--- src/input/libdvdnav/dvdnav_internal.h	20 Sep 2004 19:30:04 -0000	1.15
++++ src/input/libdvdnav/dvdnav_internal.h	17 Sep 2006 12:50:16 -0000
+@@ -34,6 +34,34 @@
+ #include <limits.h>
+ #include <string.h>
+ 
++#ifndef HAVE_GETTIMEOFDAY
++#  ifdef WIN32
++#    include <winsock.h>
++struct timezone;
++#  else
++#    include <sys/time.h>
++#  endif
++/* replacement gettimeofday implementation */
++#include <sys/timeb.h>
++static inline int dvdnav_private_gettimeofday( struct timeval *tv, void *tz )
++{
++  struct timeb t;
++  ftime( &t );
++  tv->tv_sec = t.time;
++  tv->tv_usec = t.millitm * 1000;
++  return 0;
++}
++#define gettimeofday(TV, TZ) dvdnav_private_gettimeofday((TV), (TZ))
++#define HAVE_GETTIMEOFDAY 1
++#endif
++
++#ifndef HAVE_SNPRINTF
++#  ifdef HAVE__SNPRINTF
++#    define snprintf _snprintf
++#    define HAVE_SNPRINTF 1
++#  endif
++#endif
++
+ #ifdef WIN32
+ 
+ /* pthread_mutex_* wrapper for win32 */
+@@ -45,17 +73,6 @@ typedef CRITICAL_SECTION pthread_mutex_t
+ #define pthread_mutex_unlock(a)  LeaveCriticalSection(a)
+ #define pthread_mutex_destroy(a)
+ 
+-/* replacement gettimeofday implementation */
+-#include <sys/timeb.h>
+-static inline int _private_gettimeofday( struct timeval *tv, void *tz )
+-{
+-  struct timeb t;
+-  ftime( &t );
+-  tv->tv_sec = t.time;
+-  tv->tv_usec = t.millitm * 1000;
+-  return 0;
+-}
+-#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
+ #include <io.h> /* read() */
+ #define lseek64 _lseeki64
+ 
+Index: src/input/libdvdnav/remap.c
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/remap.c,v
+retrieving revision 1.4
+diff -u -p -u -r1.4 remap.c
+--- src/input/libdvdnav/remap.c	25 Aug 2003 21:51:40 -0000	1.4
++++ src/input/libdvdnav/remap.c	17 Sep 2006 12:50:16 -0000
+@@ -22,14 +22,17 @@
+ #include <string.h>
+ #include <stdio.h>
+ 
+-#ifndef _MSC_VER 
++#ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
++#endif
++
++#ifdef HAVE_SYS_FCNTL_H
+ #include <sys/fcntl.h>
+ #else
+ #ifndef MAXPATHLEN
+ #define MAXPATHLEN 255
+ #endif
+-#endif /* _MSC_VER */
++#endif /* HAVE fcntl.h */
+ 
+ #include <assert.h>
+ #include "remap.h"
+Index: src/input/libdvdnav/searching.c
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/searching.c,v
+retrieving revision 1.19
+diff -u -p -u -r1.19 searching.c
+--- src/input/libdvdnav/searching.c	14 Oct 2005 21:02:16 -0000	1.19
++++ src/input/libdvdnav/searching.c	17 Sep 2006 12:50:16 -0000
+@@ -105,7 +105,6 @@ dvdnav_status_t dvdnav_time_search(dvdna
+   int32_t found;
+   cell_playback_t *cell;
+   dvd_state_t *state;
+-  dvdnav_status_t result;
+ 
+   if(this->position_current.still != 0) {
+     printerr("Cannot seek in a still frame.");