Index: head/multimedia/libdvdread/Makefile =================================================================== --- head/multimedia/libdvdread/Makefile (revision 489742) +++ head/multimedia/libdvdread/Makefile (revision 489743) @@ -1,32 +1,33 @@ # Created by: Marc van Woerkom <3d@FreeBSD.org> # $FreeBSD$ PORTNAME= libdvdread PORTVERSION= 6.0.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/libdvdread/${PORTVERSION}/ \ http://dvdnav.mplayerhq.hu/releases/ \ http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac MAINTAINER= martymac@FreeBSD.org COMMENT= Videolan version of the libdvdread project LICENSE= GPLv2 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= tar:bz2 gmake libtool pathfix pkgconfig USE_LDCONFIG= yes PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO OPTIONS_DEFINE= DVDCSS DOCS .if !defined(PACKAGE_BUILDING) OPTIONS_DEFAULT= DVDCSS .endif # DVDCSS version hardcoded in src/dvd_input.c (dlopen'ed) DVDCSS_LIB_DEPENDS= libdvdcss.so.2:multimedia/libdvdcss .include Index: head/multimedia/libdvdread/distinfo =================================================================== --- head/multimedia/libdvdread/distinfo (revision 489742) +++ head/multimedia/libdvdread/distinfo (revision 489743) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516309125 +TIMESTAMP = 1546990033 SHA256 (libdvdread-6.0.0.tar.bz2) = b33b1953b4860545b75f6efc06e01d9849e2ea4f797652263b0b4af6dd10f935 SIZE (libdvdread-6.0.0.tar.bz2) = 394627 Index: head/multimedia/libdvdread/files/patch-src-dvd_reader.c =================================================================== --- head/multimedia/libdvdread/files/patch-src-dvd_reader.c (nonexistent) +++ head/multimedia/libdvdread/files/patch-src-dvd_reader.c (revision 489743) @@ -0,0 +1,50 @@ +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 +@@ -64,7 +64,7 @@ static inline int _private_gettimeofday( struct timeva + # include + # include + #elif defined(SYS_BSD) +-# include ++# include + #elif defined(__linux__) + # include + # include +@@ -420,7 +420,7 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath, + } 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, + } + } + #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", +- dev_name, +- fe->fs_file ); +- auth_drive = DVDOpenImageFile( dev_name, NULL, 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", ++ dev_name, ++ fs.f_mntonname ); ++ auth_drive = DVDOpenImageFile( dev_name, NULL, NULL, have_css ); ++ } + } + #elif defined(__sun) + mntfile = fopen( MNTTAB, "r" ); Property changes on: head/multimedia/libdvdread/files/patch-src-dvd_reader.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property