[vlc-commits] Contribs: update dvdread to 6.1.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 21 21:54:34 2020 +0100| [b2965ea3b4a59034a4fd6e24ebdc756e17ea8434] | committer: Jean-Baptiste Kempf

Contribs: update dvdread to 6.1.0

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

 contrib/src/dvdread/SHA512SUMS                     |  2 +-
 .../only-use-getmntentr-when-available.patch       | 48 ----------------------
 contrib/src/dvdread/rules.mak                      |  5 +--
 3 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/contrib/src/dvdread/SHA512SUMS b/contrib/src/dvdread/SHA512SUMS
index 7b92661876..bcfa849629 100644
--- a/contrib/src/dvdread/SHA512SUMS
+++ b/contrib/src/dvdread/SHA512SUMS
@@ -1 +1 @@
-e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c  libdvdread-6.0.2.tar.bz2
+f34d039d1fbe74076cb3073a3dc6a9f3377e3bd05231a04869ca5faeb96e737750c8e019b908da89e83c14a2df38950a2d61a7c7a6c44c988b710fa875b236b5  libdvdread-6.1.0.tar.bz2
diff --git a/contrib/src/dvdread/only-use-getmntentr-when-available.patch b/contrib/src/dvdread/only-use-getmntentr-when-available.patch
deleted file mode 100644
index 52a2e3ed57..0000000000
--- a/contrib/src/dvdread/only-use-getmntentr-when-available.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From da2245e4eccca4b8816ecba3d99c6c2134e3d07c Mon Sep 17 00:00:00 2001
-From: Marvin Scholz <epirat07 at gmail.com>
-Date: Thu, 24 Oct 2019 14:42:55 +0200
-Subject: [PATCH] only use getmntent_r if available
-
----
- configure.ac     | 3 +++
- src/dvd_reader.c | 7 ++++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 78a8c3b..b2754bb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,6 +65,9 @@ AS_CASE([$host],
- AS_CASE([$host],
-   [*-os2-*], LDFLAGS="-no-undefined -Zbin-files $LDFLAGS")
- 
-+AS_CASE([$host],
-+  [*-linux-*], [AC_CHECK_FUNCS([getmntent_r])])
-+
- AC_ARG_WITH([libdvdcss],
-   AS_HELP_STRING([--with-libdvdcss], [Link directly against libdvdcss @<:@default=no@:>@]))
- 
-diff --git a/src/dvd_reader.c b/src/dvd_reader.c
-index 27dd527..6cea7b5 100644
---- a/src/dvd_reader.c
-+++ b/src/dvd_reader.c
-@@ -543,10 +543,15 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath,
- #elif defined(__linux__)
-     mntfile = fopen( _PATH_MOUNTED, "r" );
-     if( mntfile ) {
-+
-+#ifdef HAVE_GETMNTENT_R
-       struct mntent *me, mbuf;
-       char buf [8192];
--
-       while( ( me = getmntent_r( mntfile, &mbuf, buf, sizeof(buf) ) ) ) {
-+#else
-+      struct mntent *me;
-+      while( ( me = getmntent( mntfile ) ) ) {
-+#endif
-         if( !strcmp( me->mnt_dir, path_copy ) ) {
-           fprintf( stderr,
-                    "libdvdread: Attempting to use device %s"
--- 
-2.22.0
-
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 56865450e4..02f894f731 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,5 +1,5 @@
 # DVDREAD
-LIBDVDREAD_VERSION := 6.0.2
+LIBDVDREAD_VERSION := 6.1.0
 LIBDVDREAD_URL := $(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
@@ -9,7 +9,7 @@ PKGS += dvdread
 endif
 endif
 endif
-ifeq ($(call need_pkg,"dvdread >= 6.0.0"),)
+ifeq ($(call need_pkg,"dvdread >= 6.1.0"),)
 PKGS_FOUND += dvdread
 endif
 
@@ -20,7 +20,6 @@ $(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
 
 dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
 	$(UNPACK)
-	$(APPLY) $(SRC)/dvdread/only-use-getmntentr-when-available.patch
 	$(call pkg_static,"misc/dvdread.pc.in")
 	$(MOVE)