[vlc-devel] [PATCH 5 of 6] contrib: sync libdvdread patch with upstream svn

[Edouard Gomez]

# HG changeset patch
# User Edouard Gomez <ed.gomez at free.fr>
# Date 1223648709 -7200
# Node ID 51345cf594f5d2a250ee46cc0370a96a2b80e656
# Parent  77d2f22cc2429e73fb47a875f9b37e4cad010e82
contrib: sync libdvdread patch with upstream svn

diff --git a/extras/contrib/src/Patches/libdvdread-win32.patch b/extras/contrib/src/Patches/libdvdread-win32.patch
--- a/extras/contrib/src/Patches/libdvdread-win32.patch
+++ b/extras/contrib/src/Patches/libdvdread-win32.patch
@@ -1,8 +1,8 @@
 Index: src/dvd_reader.c
 ===================================================================
---- src/dvd_reader.c	(revision 1107)
+--- src/dvd_reader.c	(revision 1157)
 +++ src/dvd_reader.c	(working copy)
-@@ -32,6 +32,7 @@
+@@ -34,6 +34,7 @@
  #include <limits.h>
  #include <dirent.h>
  
@@ -10,13 +10,11 @@
  /* misc win32 helpers */
  #ifdef WIN32
  #ifndef HAVE_GETTIMEOFDAY
-@@ -50,7 +51,8 @@
+@@ -52,6 +53,7 @@
  #include <io.h> /* read() */
  #define lseek64 _lseeki64
  #endif
-- 
 +#endif
-+
- #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
+ 
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DARWIN__)
  #define SYS_BSD 1
- #endif
diff --git a/extras/contrib/src/Patches/libdvdread.patch b/extras/contrib/src/Patches/libdvdread.patch
--- a/extras/contrib/src/Patches/libdvdread.patch
+++ b/extras/contrib/src/Patches/libdvdread.patch
@@ -1,8 +1,8 @@
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 1107)
+--- configure.ac	(revision 1157)
 +++ configure.ac	(working copy)
-@@ -137,24 +137,59 @@
+@@ -137,27 +137,59 @@
  dnl ---------------------------------------------
  dnl dynamic linker
  dnl ---------------------------------------------
@@ -14,12 +14,15 @@
 -  *cygwin*)
 -    LDFLAGS="-no-undefined $LDFLAGS"
 -    ;;
+-  *os2*)
+-    LDFLAGS="-no-undefined -Zbin-files $LDFLAGS"
+-    ;;
 -  *)
 -    AC_CHECK_LIB(c, dlopen,
--	         DYNAMIC_LD_LIBS="",
--	         AC_CHECK_LIB(dl, dlopen,
--             	              DYNAMIC_LD_LIBS="-ldl",
--	                      AC_MSG_ERROR(dynamic linker needed)))
+-                 DYNAMIC_LD_LIBS="",
+-                 AC_CHECK_LIB(dl, dlopen,
+-                              DYNAMIC_LD_LIBS="-ldl",
+-                              AC_MSG_ERROR(dynamic linker needed)))
 -    AC_SUBST(DYNAMIC_LD_LIBS)
 -    ;;
 -esac
@@ -31,7 +34,7 @@
 +     if test x"$withval" != xyes; then
 +       dvdcss_path=$withval
 +     fi])
- 
++  
 +if test x"$link_dvdcss" != xyes; then
 +dnl dlopen libdvdcss
 +  AC_CHECK_FUNC( dlopen,
@@ -71,7 +74,7 @@
 +    CPPFLAGS=$saved_CPPFLAGS
 +  fi
 +fi
-+
+ 
 +AC_SUBST(DL_LIBS)
 +AC_SUBST(CSS_LIBS)
 +AC_SUBST(CSS_CFLAGS)