[vlc-commits] Contribs: update dvdread to 6.0.1

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Feb 16 15:25:29 2019 +0100| [5ff146af07c78ba3feea26a7ffc8fbf0aff18aa0] | committer: Jean-Baptiste Kempf

Contribs: update dvdread to 6.0.1

(cherry picked from commit 776377dfa14158d35fa8ff0d9a24b60a83ef5c0d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5ff146af07c78ba3feea26a7ffc8fbf0aff18aa0
---

 ...01-Invalidate-cache-when-forcing-filesize.patch | 26 ----------------------
 contrib/src/dvdread/SHA512SUMS                     |  2 +-
 contrib/src/dvdread/rules.mak                      |  5 ++---
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/contrib/src/dvdread/0001-Invalidate-cache-when-forcing-filesize.patch b/contrib/src/dvdread/0001-Invalidate-cache-when-forcing-filesize.patch
deleted file mode 100644
index db2be4ec57..0000000000
--- a/contrib/src/dvdread/0001-Invalidate-cache-when-forcing-filesize.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 978c6275c004db5485fb7ffde2508b89cc45c7f7 Mon Sep 17 00:00:00 2001
-From: Thomas Guillem <thomas at gllm.fr>
-Date: Tue, 8 Jan 2019 15:51:08 +0100
-Subject: [PATCH] Invalidate cache when forcing filesize
-
-This fixes playback of Resident Evil Extention DVD.
----
- src/dvd_reader.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/dvd_reader.c b/src/dvd_reader.c
-index 4e112d3..b700dd5 100644
---- a/src/dvd_reader.c
-+++ b/src/dvd_reader.c
-@@ -1332,6 +1332,8 @@ int DVDFileSeekForce(dvd_file_t *dvd_file, int offset, int force_size)
-       force_size = (offset - 1) / DVD_VIDEO_LB_LEN + 1;
-     if( dvd_file->filesize < force_size ) {
-       dvd_file->filesize = force_size;
-+      free(dvd_file->cache);
-+      dvd_file->cache = NULL;
-       fprintf(stderr, "libdvdread: Ignored size of file indicated in UDF.\n");
-     }
-   }
--- 
-2.20.1
-
diff --git a/contrib/src/dvdread/SHA512SUMS b/contrib/src/dvdread/SHA512SUMS
index 54583695e0..e378d21180 100644
--- a/contrib/src/dvdread/SHA512SUMS
+++ b/contrib/src/dvdread/SHA512SUMS
@@ -1 +1 @@
-b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479  libdvdread-6.0.0.tar.bz2
+550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b  libdvdread-6.0.1.tar.bz2
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 2dea43acf2..837e0c241f 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,5 +1,5 @@
 # DVDREAD
-LIBDVDREAD_VERSION := 6.0.0
+LIBDVDREAD_VERSION := 6.0.1
 LIBDVDREAD_URL := $(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
@@ -7,7 +7,7 @@ ifdef GPL
 PKGS += dvdread
 endif
 endif
-ifeq ($(call need_pkg,"dvdread >= 5.0.3"),)
+ifeq ($(call need_pkg,"dvdread >= 6.0.0"),)
 PKGS_FOUND += dvdread
 endif
 
@@ -18,7 +18,6 @@ $(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
 
 dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
 	$(UNPACK)
-	$(APPLY) $(SRC)/dvdread/0001-Invalidate-cache-when-forcing-filesize.patch
 	cd $(UNPACK_DIR) && sed -i -e 's,Requires.private,Requires,g' misc/*.pc.in
 	$(MOVE)