contrib: Update to libdvdnav 6.0.1.

diff --git a/contrib/libdvdnav/A00-tmap-divide-zero.patch b/contrib/libdvdnav/A00-tmap-divide-zero.patch
deleted file mode 100644 (file)
index 442e1e2..0000000
--- a/contrib/libdvdnav/A00-tmap-divide-zero.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 320b88d3489a8dc03c88252fededd8db1bb7964e Mon Sep 17 00:00:00 2001
-From: John Sullivan <jsgthb@kanargh.org.uk>
-Date: Fri, 9 Aug 2019 13:33:49 +0100
-Subject: [PATCH] Avoid division-by-zero when tmap search returns two tmap
- entries with the same vobu_idx (which can happen at the end of a title).
-
----
- src/searching.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/searching.c b/src/searching.c
-index f638b613..6e6b78b2 100644
---- a/src/searching.c
-+++ b/src/searching.c
-@@ -1094,8 +1094,14 @@ static int32_t dvdnav_tmap_calc_time_for_tmap_entry(dvdnav_jump_args_t *args,
-   }
- 
-   /* calc position of cell relative to lo */
--  vobu_pct = ((pos->vobu_idx - lo->vobu_idx) * 1000)
--            / ( hi->vobu_idx - lo->vobu_idx);
-+  if (hi->vobu_idx == lo->vobu_idx) {
-+    /* We are at the very end - pos should also equal lo so force that
-+     * rather than hit the divide-by-zero. */
-+    vobu_pct = 0;
-+  } else {
-+    vobu_pct = ((pos->vobu_idx - lo->vobu_idx) * 1000)
-+      / ( hi->vobu_idx - lo->vobu_idx);
-+  }
-   if (vobu_pct < 0 || vobu_pct > 1000) {
-     fprintf(MSG_OUT, "vobu_pct must be between 0 and 1000");
-     return 0;
--- 
-2.21.0
-

diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index b10790cc5c66e9bd241f51c2d72e9c0c2d594f5b..b1ca4047ca07c44339d1790bde2142c537f0f55b 100644 (file)
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -1,9 +1,9 @@
 $(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,LIBDVDREAD))
 $(eval $(call import.CONTRIB.defs,LIBDVDNAV))
 
-LIBDVDNAV.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libdvdnav-6.0.0.tar.bz2
-LIBDVDNAV.FETCH.url    += https://download.videolan.org/pub/videolan/libdvdnav/6.0.0/libdvdnav-6.0.0.tar.bz2
-LIBDVDNAV.FETCH.sha256  = f0a2711b08a021759792f8eb14bb82ff8a3c929bf88c33b64ffcddaa27935618
+LIBDVDNAV.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libdvdnav-6.0.1.tar.bz2
+LIBDVDNAV.FETCH.url    += https://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2
+LIBDVDNAV.FETCH.sha256  = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
 
 ifneq (max,$(LIBDVDNAV.GCC.g))
     LIBDVDNAV.GCC.D += NDEBUG