From 2b12626d742e17e4182694ec1c521137b10ef1d3 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sat, 3 Jul 2010 14:24:26 +0000
Subject: Address PR 43086 and PR 43545 based on obache's patch in the former.
 (build fix for Linux, so no PKGREVISION bump)

---
 multimedia/vlc/distinfo         | 4 ++--
 multimedia/vlc/patches/patch-aa | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'multimedia/vlc')

diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index e39e0298e81..833984846fc 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2010/06/20 15:58:06 wiz Exp $
+$NetBSD: distinfo,v 1.38 2010/07/03 14:24:26 wiz Exp $
 
 SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786
 RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1
 Size (vlc-1.0.6.tar.bz2) = 22149704 bytes
-SHA1 (patch-aa) = 4d662c0e4e97ebfa6eccfa8df821c132441df58c
+SHA1 (patch-aa) = 7e3939a647f04661a2eba4fdbb720637dd267334
 SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271
 SHA1 (patch-configure) = 44f3bc76668d9529ce35812d2c194199a0623a09
 SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407
diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa
index 24c32f3cc88..ebcd89edbab 100644
--- a/multimedia/vlc/patches/patch-aa
+++ b/multimedia/vlc/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2010/06/20 15:58:06 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2010/07/03 14:24:26 wiz Exp $
 
 http://trac.videolan.org/vlc/ticket/3762
 
@@ -19,7 +19,7 @@ http://trac.videolan.org/vlc/ticket/3762
  static bool IsRemote (int fd)
  {
 -#ifdef HAVE_FSTATFS
-+#ifdef HAVE_FSTATVFS
++#if !defined(__linux__) && defined(HAVE_FSTATVFS)
 +    struct statvfs s;
 +    if (fstatvfs(fd, &s))
 +        return false;  
-- 
cgit v1.2.3