]> git.sesse.net Git - vlc/commitdiff
Contrib: Remove libdvdnav-win32 patch, applied upstream.
authorPavlov Konstantin <thresh@videolan.org>
Thu, 5 Jun 2008 15:37:52 +0000 (19:37 +0400)
committerPavlov Konstantin <thresh@videolan.org>
Thu, 5 Jun 2008 15:37:52 +0000 (19:37 +0400)
extras/contrib/src/Makefile
extras/contrib/src/Patches/libdvdnav-win32.patch [deleted file]

index 774304d6c10534c387fac001a690ea2c9ae301ea..de9d221837a61116b7dfeefe19551b1315a76822 100644 (file)
@@ -1174,9 +1174,6 @@ ifdef SVN
 libdvdnav:
        $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
        patch -d libdvdnav -p1 < Patches/libdvdnav.patch
-ifdef HAVE_WIN32
-       patch -p0 < Patches/libdvdnav-win32.patch
-endif
        (cd $@; ./autogen.sh noconfig)
 else
 libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
diff --git a/extras/contrib/src/Patches/libdvdnav-win32.patch b/extras/contrib/src/Patches/libdvdnav-win32.patch
deleted file mode 100644 (file)
index 4126c6d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 */