Update multimedia/libdvdread and multimedia/libdvdnav to 6.1.0

Changelogs are available here:
https://code.videolan.org/videolan/libdvdread/-/blob/master/NEWS
https://code.videolan.org/videolan/libdvdnav/-/blob/master/ChangeLog

Also, bump dependent ports' revisions and mark sysutils/dvdbackup as BROKEN [1]

Approved by:	ehaupt [1]

25 files changed, 40 insertions, 37 deletions

diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index d85576fe60d3..94f7a0262a00 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dvdauthor
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}
 
diff --git a/multimedia/gstreamer-plugins-dvd/Makefile b/multimedia/gstreamer-plugins-dvd/Makefile
index 910de451ba20..2cc458edad12 100644
--- a/multimedia/gstreamer-plugins-dvd/Makefile
+++ b/multimedia/gstreamer-plugins-dvd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/multimedia/gstreamer-plugins-dvd/Makefile,v 1.7 2008/03/19 14:05:36 ahze Exp $
 
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dvd plugin set
diff --git a/multimedia/gstreamer1-plugins-dvdread/Makefile b/multimedia/gstreamer1-plugins-dvdread/Makefile
index ada7078490c4..8fcb1fbdb882 100644
--- a/multimedia/gstreamer1-plugins-dvdread/Makefile
+++ b/multimedia/gstreamer1-plugins-dvdread/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	GStreamer DVD access plugin with libdvdread
diff --git a/multimedia/gstreamer1-plugins-resindvd/Makefile b/multimedia/gstreamer1-plugins-resindvd/Makefile
index 9a675866ac32..c628b7a06e0b 100644
--- a/multimedia/gstreamer1-plugins-resindvd/Makefile
+++ b/multimedia/gstreamer1-plugins-resindvd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	GStreamer resindvd DVD playback plugin
diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile
index 8c4e65e1db48..8d64ae5dc781 100644
--- a/multimedia/kodi-devel/Makefile
+++ b/multimedia/kodi-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	19.0.a20200318
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-devel
 
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index ef5ad67ae5de..ca904cb81297 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libdvdnav
-PORTVERSION=	6.0.1
+PORTVERSION=	6.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/libdvdnav/${PORTVERSION}/ \
 		http://dvdnav.mplayerhq.hu/releases/ \
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo
index c0d4523abe6a..2816063086d9 100644
--- a/multimedia/libdvdnav/distinfo
+++ b/multimedia/libdvdnav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571086572
-SHA256 (libdvdnav-6.0.1.tar.bz2) = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
-SIZE (libdvdnav-6.0.1.tar.bz2) = 378491
+TIMESTAMP = 1585069260
+SHA256 (libdvdnav-6.1.0.tar.bz2) = f697b15ea9f75e9f36bdf6ec3726308169f154e2b1e99865d0bbe823720cee5b
+SIZE (libdvdnav-6.1.0.tar.bz2) = 370145
diff --git a/multimedia/libdvdnav/pkg-plist b/multimedia/libdvdnav/pkg-plist
index d94293088e9f..1b409bc2869f 100644
--- a/multimedia/libdvdnav/pkg-plist
+++ b/multimedia/libdvdnav/pkg-plist
@@ -1,8 +1,9 @@
 include/dvdnav/dvd_types.h
 include/dvdnav/dvdnav.h
 include/dvdnav/dvdnav_events.h
+include/dvdnav/version.h
 lib/libdvdnav.a
 lib/libdvdnav.so
 lib/libdvdnav.so.4
-lib/libdvdnav.so.4.2.0
+lib/libdvdnav.so.4.3.0
 libdata/pkgconfig/dvdnav.pc
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 73b257446bbd..137cb6b34284 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libdvdread
-PORTVERSION=	6.0.2
+PORTVERSION=	6.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/libdvdread/${PORTVERSION}/ \
 		http://dvdnav.mplayerhq.hu/releases/ \
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index 16f899de2bca..acd75218e8f5 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571085572
-SHA256 (libdvdread-6.0.2.tar.bz2) = f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0
-SIZE (libdvdread-6.0.2.tar.bz2) = 405298
+TIMESTAMP = 1584981910
+SHA256 (libdvdread-6.1.0.tar.bz2) = 501bbd7d1e7d5f2d2a0ff8d0a6ac2fbd7e5e7e0e80ef82fef818f43a30b4750c
+SIZE (libdvdread-6.1.0.tar.bz2) = 391316
diff --git a/multimedia/libdvdread/files/patch-src-dvd_reader.c b/multimedia/libdvdread/files/patch-src-dvd_reader.c
index 603782febd8d..3bca4c7dd538 100644
--- a/multimedia/libdvdread/files/patch-src-dvd_reader.c
+++ b/multimedia/libdvdread/files/patch-src-dvd_reader.c
@@ -3,7 +3,7 @@ Use statfs() instead of getfsfile() to get device name from a mount point.
 (getfsfile() requires an entry in the fstab file which is often not the case
 for removable media)
 
---- src/dvd_reader.c.orig	2018-01-17 21:35:39 UTC
+--- src/dvd_reader.c.orig	2020-03-04 18:57:19 UTC
 +++ src/dvd_reader.c
 @@ -64,7 +64,7 @@ static inline int _private_gettimeofday( struct timeva
  # include <sys/ucred.h>
@@ -14,36 +14,34 @@ for removable media)
  #elif defined(__linux__)
  # include <mntent.h>
  # include <paths.h>
-@@ -420,7 +420,7 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath,
+@@ -435,7 +435,7 @@ static dvd_reader_t *DVDOpenCommon( void *priv,
+     return ctx;
    } else if( S_ISDIR( fileinfo.st_mode ) ) {
-     dvd_reader_t *auth_drive = 0;
  #if defined(SYS_BSD)
 -    struct fstab* fe;
 +    struct statfs fs;
  #elif defined(__sun) || defined(__linux__)
      FILE *mntfile;
  #endif
-@@ -511,14 +511,16 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath,
+@@ -525,13 +525,15 @@ static dvd_reader_t *DVDOpenCommon( void *priv,
          }
      }
  #elif defined(SYS_BSD)
 -    if( ( fe = getfsfile( path_copy ) ) ) {
 -      dev_name = bsd_block2char( fe->fs_spec );
--      fprintf( stderr,
--               "libdvdread: Attempting to use device %s"
--               " mounted on %s for CSS authentication\n",
+-      Log3(ctx, "Attempting to use device %s"
+-               " mounted on %s for CSS authentication",
 -               dev_name,
 -               fe->fs_file );
--      auth_drive = DVDOpenImageFile( dev_name, NULL, NULL, have_css );
+-      ctx->rd = DVDOpenImageFile( ctx, dev_name, NULL, have_css );
 +    if( statfs( path_copy, &fs ) == 0 ) {
 +        if( !strcmp( path_copy, fs.f_mntonname ) ) {
 +            dev_name = bsd_block2char( fs.f_mntfromname );
-+            fprintf( stderr,
-+                     "libdvdread: Attempting to use device %s"
-+                     " mounted on %s for CSS authentication\n",
++            Log3(ctx, "Attempting to use device %s"
++                     " mounted on %s for CSS authentication",
 +                     dev_name,
 +                     fs.f_mntonname );
-+            auth_drive = DVDOpenImageFile( dev_name, NULL, NULL, have_css );
++            ctx->rd = DVDOpenImageFile( ctx, dev_name, NULL, have_css );
 +        }
      }
  #elif defined(__sun)
diff --git a/multimedia/libdvdread/files/patch-src-dvdread-ifo_types.h b/multimedia/libdvdread/files/patch-src-dvdread-ifo_types.h
index 1ba380740197..4a60adca2dc8 100644
--- a/multimedia/libdvdread/files/patch-src-dvdread-ifo_types.h
+++ b/multimedia/libdvdread/files/patch-src-dvdread-ifo_types.h
@@ -1,5 +1,5 @@
---- src/dvdread/ifo_types.h.orig	2015-06-27 19:35:59.043370000 +0200
-+++ src/dvdread/ifo_types.h	2015-06-27 19:37:10.885577000 +0200
+--- src/dvdread/ifo_types.h.orig	2020-03-04 18:57:19 UTC
++++ src/dvdread/ifo_types.h
 @@ -32,7 +32,7 @@
  
  #if defined(__GNUC__)
diff --git a/multimedia/libdvdread/pkg-plist b/multimedia/libdvdread/pkg-plist
index f6a4f2f3ebb5..f6bcab6d807e 100644
--- a/multimedia/libdvdread/pkg-plist
+++ b/multimedia/libdvdread/pkg-plist
@@ -11,5 +11,5 @@ include/dvdread/version.h
 lib/libdvdread.a
 lib/libdvdread.so
 lib/libdvdread.so.7
-lib/libdvdread.so.7.0.0
+lib/libdvdread.so.7.1.0
 libdata/pkgconfig/dvdread.pc
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index bd6e78f9263b..e81e6189c10c 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.2.9
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 4ff5310fa175..bd71655ed605 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lsdvd
 PORTVERSION=	0.17
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile
index d9045b37ab0d..eb3cf096ddfc 100644
--- a/multimedia/lxdvdrip/Makefile
+++ b/multimedia/lxdvdrip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lxdvdrip
 PORTVERSION=	1.62
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/lxdvdrip/
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 025ef56e2e16..3381be65e938 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 1c73eaaa37ee..718978156556 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index aa26f0fd1c7e..bfba195d914c 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	mpv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.32.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://waf.io/:waf
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 39abf128b4c9..8d693482c0ab 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ogmrip
 PORTVERSION=	1.0.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}
 
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index 1338d1a282c8..c87bffa93537 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ogmtools
 PORTVERSION=	1.5
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/ogmtools/
 
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile
index 2cf896923ac7..6f3b83091a19 100644
--- a/multimedia/py-kaa-metadata/Makefile
+++ b/multimedia/py-kaa-metadata/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kaa-metadata
 PORTVERSION=	0.7.7
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF/freevo/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 739d5643fe21..9ce8f1887fa0 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.7
-PORTREVISION=	41
+PORTREVISION=	42
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/france/transcode-tcforge/downloads/
 
diff --git a/multimedia/vamps/Makefile b/multimedia/vamps/Makefile
index 43e72bac3e6e..1c96002362a8 100644
--- a/multimedia/vamps/Makefile
+++ b/multimedia/vamps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vamps
 PORTVERSION=	0.99.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/Vamps/${PORTVERSION}
 
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 8c1648765593..9b0d0fb56dcb 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	3.0.8
-PORTREVISION=	20
+PORTREVISION=	21
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \