summaryrefslogtreecommitdiff
path: root/multimedia/libdvdread/patches
diff options
context:
space:
mode:
authorjoerg <joerg>2006-04-12 17:19:36 +0000
committerjoerg <joerg>2006-04-12 17:19:36 +0000
commitbbe339f15cf684b67d0490acf7dd34cc2baf1ce5 (patch)
tree533d5a91f370ed6bf9b85a42c3879398bcd3c2fc /multimedia/libdvdread/patches
parent8cae2288ede537bdc64cf3b55d82b56b54334990 (diff)
downloadpkgsrc-bbe339f15cf684b67d0490acf7dd34cc2baf1ce5.tar.gz
Short-cut block2device on DragonFly and FreeBSD, it is not needed.
Slightly modified version of Steve O'Hara-Smith's patch on pkgsrc-users.
Diffstat (limited to 'multimedia/libdvdread/patches')
-rw-r--r--multimedia/libdvdread/patches/patch-ab15
1 files changed, 13 insertions, 2 deletions
diff --git a/multimedia/libdvdread/patches/patch-ab b/multimedia/libdvdread/patches/patch-ab
index c0eb90bc6b3..2dd7efde81b 100644
--- a/multimedia/libdvdread/patches/patch-ab
+++ b/multimedia/libdvdread/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2006/01/23 22:09:26 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2006/04/12 17:19:36 joerg Exp $
---- dvdread/dvd_reader.c.orig 2006-01-22 16:45:29.000000000 +0100
+--- dvdread/dvd_reader.c.orig 2006-01-22 15:45:29.000000000 +0000
+++ dvdread/dvd_reader.c
@@ -33,7 +33,7 @@
#include <limits.h>
@@ -11,3 +11,14 @@ $NetBSD: patch-ab,v 1.4 2006/01/23 22:09:26 wiz Exp $
#define SYS_BSD 1
#endif
+@@ -404,7 +404,9 @@ static char *sun_block2char( const char
+ static char *bsd_block2char( const char *path )
+ {
+ char *new_path;
+-
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++ return (char *) strdup( path ); /* Do not add an r for DragonFly and FreeBSD */
++#endif
+ /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */
+ if( strncmp( path, "/dev/", 5 ) || !strncmp( path, "/dev/r", 6 ) )
+ return (char *) strdup( path );