[libdvd] update patch for libdvdread

2 files changed, 34 insertions, 0 deletions

diff --git a/lib/libdvd/patches/libdvdread.diff b/lib/libdvd/patches/01-libdvdread.diff
index fbf185f0dd..fbf185f0dd 100644
--- a/lib/libdvd/patches/libdvdread.diff
+++ b/lib/libdvd/patches/01-libdvdread.diff
diff --git a/lib/libdvd/patches/02-libdvdread_fix_symlinks_resolution_vfs.diff b/lib/libdvd/patches/02-libdvdread_fix_symlinks_resolution_vfs.diff
new file mode 100644
index 0000000000..30c66c3f4c
--- /dev/null
+++ b/lib/libdvd/patches/02-libdvdread_fix_symlinks_resolution_vfs.diff
@@ -0,0 +1,34 @@
+diff --git a/lib/libdvd/libdvdread/src/dvd_reader.c b/lib/libdvd/libdvdread/src/dvd_reader.c
+index d9544b3..f5ee550 100644
+--- a/lib/libdvd/libdvdread/src/dvd_reader.c
++++ b/lib/libdvd/libdvdread/src/dvd_reader.c
+@@ -429,10 +429,17 @@ dvd_reader_t *DVDOpen( const char *ppath )
+               /* Also WIN32 does not have symlinks, so we don't need this bit of code. */
+ 
+     /* Resolve any symlinks and get the absolute dir name. */
++#if defined(_XBMC) /* for XBMC, only do symlink resolution for (real) non-xbmc-VFS paths */
++	if ( path[0] == '/' )
++#endif // _XBMC
+ 	{
+       if( ( cdir  = open( ".", O_RDONLY ) ) >= 0 ) {
+         if( chdir( path_copy ) == -1 ) {
++#if defined(_XBMC)
++          fprintf( stderr, "libdvdread: failed to change working directory to \"%s\": %s\n", path_copy, strerror(errno)); /* but ignore error */
++#else
+           goto DVDOpen_error;
++#endif // _XBMC
+         }
+ 		new_path = malloc(PATH_MAX+1);
+ 		if(!new_path) {
+@@ -445,7 +452,11 @@ dvd_reader_t *DVDOpen( const char *ppath )
+ 		close( cdir );
+         cdir = -1;
+         if( retval == -1 ) {
++#if defined(_XBMC)
++          fprintf( stderr, "libdvdread: failed to reset working directory to \".\": %s\n", strerror(errno)); /* but ignore error */
++#else
+           goto DVDOpen_error;
++#endif // _XBMC
+         }
+ 		    path_copy = new_path;
+         new_path = NULL;