From 40e5d0d1abbf12b90e8b47ccdbd7452d720b0b52 Mon Sep 17 00:00:00 2001 From: Pavlov Konstantin Date: Thu, 5 Jun 2008 19:37:52 +0400 Subject: [PATCH] Contrib: Remove libdvdnav-win32 patch, applied upstream. --- extras/contrib/src/Makefile | 3 --- extras/contrib/src/Patches/libdvdnav-win32.patch | 15 --------------- 2 files changed, 18 deletions(-) delete mode 100644 extras/contrib/src/Patches/libdvdnav-win32.patch diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 774304d6c1..de9d221837 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -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 index 4126c6d4fc..0000000000 --- a/extras/contrib/src/Patches/libdvdnav-win32.patch +++ /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 */ -- 2.39.2