Attachment 200871 Details for Bug 234694 – patch

[patch] patch

libdvdread.patch (text/plain), 2.72 KB, created by Tijl Coosemans on 2019-01-07 17:17:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2019-01-07 17:17:19 UTC

Size: 2.72 KB

patch

obsolete

>Index: multimedia/libdvdread/Makefile
>===================================================================
>--- multimedia/libdvdread/Makefile	(revision 489572)
>+++ multimedia/libdvdread/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> 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/ \
>Index: multimedia/libdvdread/files/patch-src-dvd_reader.c
>===================================================================
>--- multimedia/libdvdread/files/patch-src-dvd_reader.c	(nonexistent)
>+++ multimedia/libdvdread/files/patch-src-dvd_reader.c	(working copy)
>@@ -0,0 +1,45 @@
>+--- 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 <sys/ucred.h>
>+ # include <sys/mount.h>
>+ #elif defined(SYS_BSD)
>+-# include <fstab.h>
>++# include <sys/mount.h>
>+ #elif defined(__linux__)
>+ # include <mntent.h>
>+ # include <paths.h>
>+@@ -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: 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

Actions: View | Diff

Attachments on bug 234694: 200871