contribs: fix libdvdnav runtime on win32 (patch was deleted when switching to mplayer...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 88d440f0bebcccb3cf3363fd52111b209e20a9f2..b52a523cec3865f0720e8f396e2944d23c632853 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1159,14 +1159,20 @@ ifdef SVN
 libdvdnav:
        $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
        patch -p0 < Patches/libdvdnav.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libdvdnav-win32.patch
+endif
        (cd $@; ./autogen.sh noconfig)
 else
-libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
+libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
        $(WGET) $(LIBDVDNAV_URL)
 
-libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
+libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
+       $(EXTRACT_GZ)
        patch -p0 < Patches/libdvdnav.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libdvdnav-win32.patch
+endif
        (cd $@; ./autogen.sh noconfig)
 endif
 

diff --git a/extras/contrib/src/Patches/libdvdnav-win32.patch b/extras/contrib/src/Patches/libdvdnav-win32.patch
new file mode 100644 (file)
index 0000000..4126c6d
--- /dev/null
+++ b/extras/contrib/src/Patches/libdvdnav-win32.patch
@@ -0,0 +1,15 @@
+--- libdvdnav.orig/src/remap.c 2007-12-23 13:48:04.000000000 +0100
++++ libdvdnav/src/remap.c      2007-12-23 13:49:45.000000000 +0100
+@@ -203,7 +203,11 @@
+     remap_t *map;
+ 
+     /* Build the map filename */
+-    home = getenv("HOME"); assert(home);
++    home = getenv("HOME");
++    if (!home) {
++    fprintf( MSG_OUT, "libdvdnav: Unable to find map for title '%s' (HOME directory not found)\n", title);
++    return NULL;
++    }
+     snprintf(fname, sizeof(fname), "%s/.dvdnav/%s.map", home, title);
+ 
+     /* Open the map file */