diff options
Diffstat (limited to 'multimedia/vlc/patches')
-rw-r--r-- | multimedia/vlc/patches/patch-aa | 21 | ||||
-rw-r--r-- | multimedia/vlc/patches/patch-configure | 15 |
2 files changed, 22 insertions, 14 deletions
diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa index 1f51b4ac33f..c4d299b6d5d 100644 --- a/multimedia/vlc/patches/patch-aa +++ b/multimedia/vlc/patches/patch-aa @@ -1,28 +1,27 @@ -$NetBSD: patch-aa,v 1.9 2009/08/30 16:17:13 tnn Exp $ +$NetBSD: patch-aa,v 1.10 2009/09/24 22:14:57 ahoka Exp $ ---- modules/access/file.c.orig 2009-07-28 00:24:17.000000000 +0200 +--- modules/access/file.c.orig 2009-09-18 18:37:45.000000000 +0200 +++ modules/access/file.c -@@ -51,6 +51,9 @@ +@@ -50,6 +50,8 @@ + #if defined (__linux__) # include <sys/vfs.h> # include <linux/magic.h> - # define HAVE_FSTATFS 1 -+#elif defined(__NetBSD__) ++#elif defined (HAVE_FSTATVFS) +# include <sys/statvfs.h> -+# define HAVE_FSTATVFS 1 #elif defined (HAVE_SYS_MOUNT_H) + # include <sys/param.h> # include <sys/mount.h> - # define HAVE_FSTATFS 1 -@@ -126,6 +129,13 @@ struct access_sys_t +@@ -126,7 +128,12 @@ struct access_sys_t static bool IsRemote (int fd) { +-#ifdef HAVE_FSTATFS +#ifdef HAVE_FSTATVFS + struct statvfs s; + if (fstatvfs(fd, &s)) + return false; + return !(s.f_flag & MNT_LOCAL); -+#endif -+ - #ifdef HAVE_FSTATFS ++#elif defined (HAVE_FSTATFS) struct statfs stf; + if (fstatfs (fd, &stf)) diff --git a/multimedia/vlc/patches/patch-configure b/multimedia/vlc/patches/patch-configure index 5e46f498f02..5af8723bdd1 100644 --- a/multimedia/vlc/patches/patch-configure +++ b/multimedia/vlc/patches/patch-configure @@ -1,8 +1,17 @@ -$NetBSD: patch-configure,v 1.3 2009/07/07 16:17:47 tnn Exp $ +$NetBSD: patch-configure,v 1.4 2009/09/24 22:14:57 ahoka Exp $ ---- configure.ac.orig 2009-06-20 16:08:32.000000000 +0200 +--- configure.ac.orig 2009-09-19 21:30:21.000000000 +0200 +++ configure.ac -@@ -2490,7 +2490,7 @@ then +@@ -572,7 +572,7 @@ AC_CHECK_FUNCS(fdatasync,, + ]) + + dnl Check for non-standard system calls +-AC_CHECK_FUNCS([vmsplice eventfd fstatfs]) ++AC_CHECK_FUNCS([vmsplice eventfd fstatvfs fstatfs]) + + AH_BOTTOM([#include <vlc_fixups.h>]) + +@@ -2498,7 +2498,7 @@ then fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" |