Sun Jul 4 20:11:31 2010 UTC ()
Pullup ticket #3154 - requested by wiz
multimedia/vlc: portability fix

Revisions pulled up:
- multimedia/vlc/distinfo			1.38
- multimedia/vlc/patches/patch-aa		1.13
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Jul  3 14:24:26 UTC 2010

Modified Files:
	pkgsrc/multimedia/vlc: distinfo
	pkgsrc/multimedia/vlc/patches: patch-aa

Log Message:
Address PR 43086 and PR 43545 based on obache's patch in the former.
(build fix for Linux, so no PKGREVISION bump)


(tron)
diff -r1.37 -r1.37.2.1 pkgsrc/multimedia/vlc/distinfo
diff -r1.12 -r1.12.2.1 pkgsrc/multimedia/vlc/patches/patch-aa
cvs diff -r1.37 -r1.37.2.1 pkgsrc/multimedia/vlc/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/distinfo 2010/06/20 15:58:06 1.37
+++ pkgsrc/multimedia/vlc/distinfo 2010/07/04 20:11:30 1.37.2.1
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.37 2010/06/20 15:58:06 wiz Exp $ 1$NetBSD: distinfo,v 1.37.2.1 2010/07/04 20:11:30 tron Exp $
2 2
3SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786 3SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786
4RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 4RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1
5Size (vlc-1.0.6.tar.bz2) = 22149704 bytes 5Size (vlc-1.0.6.tar.bz2) = 22149704 bytes
6SHA1 (patch-aa) = 4d662c0e4e97ebfa6eccfa8df821c132441df58c 6SHA1 (patch-aa) = 7e3939a647f04661a2eba4fdbb720637dd267334
7SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271 7SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271
8SHA1 (patch-configure) = 44f3bc76668d9529ce35812d2c194199a0623a09 8SHA1 (patch-configure) = 44f3bc76668d9529ce35812d2c194199a0623a09
9SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407 9SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407
cvs diff -r1.12 -r1.12.2.1 pkgsrc/multimedia/vlc/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/patches/Attic/patch-aa 2010/06/20 15:58:06 1.12
+++ pkgsrc/multimedia/vlc/patches/Attic/patch-aa 2010/07/04 20:11:31 1.12.2.1
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-aa,v 1.12 2010/06/20 15:58:06 wiz Exp $ 1$NetBSD: patch-aa,v 1.12.2.1 2010/07/04 20:11:31 tron Exp $
2 2
3http://trac.videolan.org/vlc/ticket/3762 3http://trac.videolan.org/vlc/ticket/3762
4 4
5--- modules/access/file.c.orig 2009-09-18 19:37:45 +0300 5--- modules/access/file.c.orig 2009-09-18 19:37:45 +0300
6+++ modules/access/file.c 2009-09-26 07:18:35 +0300 6+++ modules/access/file.c 2009-09-26 07:18:35 +0300
7@@ -50,6 +50,9 @@ 7@@ -50,6 +50,9 @@
8 #if defined (__linux__) 8 #if defined (__linux__)
9 # include <sys/vfs.h> 9 # include <sys/vfs.h>
10 # include <linux/magic.h> 10 # include <linux/magic.h>
11+#elif defined (HAVE_FSTATVFS) 11+#elif defined (HAVE_FSTATVFS)
12+# include <sys/statvfs.h> 12+# include <sys/statvfs.h>
13+# include <sys/mount.h> 13+# include <sys/mount.h>
14 #elif defined (HAVE_SYS_MOUNT_H) 14 #elif defined (HAVE_SYS_MOUNT_H)
15 # include <sys/param.h> 15 # include <sys/param.h>
16 # include <sys/mount.h> 16 # include <sys/mount.h>
17@@ -126,7 +129,12 @@ struct access_sys_t 17@@ -126,7 +129,12 @@ struct access_sys_t
18  18
19 static bool IsRemote (int fd) 19 static bool IsRemote (int fd)
20 { 20 {
21-#ifdef HAVE_FSTATFS 21-#ifdef HAVE_FSTATFS
22+#ifdef HAVE_FSTATVFS 22+#if !defined(__linux__) && defined(HAVE_FSTATVFS)
23+ struct statvfs s; 23+ struct statvfs s;
24+ if (fstatvfs(fd, &s)) 24+ if (fstatvfs(fd, &s))
25+ return false;  25+ return false;
26+ return !(s.f_flag & MNT_LOCAL); 26+ return !(s.f_flag & MNT_LOCAL);
27+#elif defined (HAVE_FSTATFS) 27+#elif defined (HAVE_FSTATFS)
28 struct statfs stf; 28 struct statfs stf;
29  29
30 if (fstatfs (fd, &stf)) 30 if (fstatfs (fd, &stf))