Commit 40e5d0d1 authored by Pavlov Konstantin's avatar Pavlov Konstantin

Contrib: Remove libdvdnav-win32 patch, applied upstream.

parent 25ef68ba
...@@ -1174,9 +1174,6 @@ ifdef SVN ...@@ -1174,9 +1174,6 @@ ifdef SVN
libdvdnav: libdvdnav:
$(SVN) co $(LIBDVDNAV_SVN) libdvdnav $(SVN) co $(LIBDVDNAV_SVN) libdvdnav
patch -d libdvdnav -p1 < Patches/libdvdnav.patch patch -d libdvdnav -p1 < Patches/libdvdnav.patch
ifdef HAVE_WIN32
patch -p0 < Patches/libdvdnav-win32.patch
endif
(cd $@; ./autogen.sh noconfig) (cd $@; ./autogen.sh noconfig)
else else
libdvdnav-$(LIBDVDNAV_VERSION).tar.gz: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
......
--- 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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment