diff options
| -rw-r--r-- | multimedia/vlc/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/vlc/PLIST | 3 | ||||
| -rw-r--r-- | multimedia/vlc/distinfo | 12 | ||||
| -rw-r--r-- | multimedia/vlc/patches/patch-aa | 21 | ||||
| -rw-r--r-- | multimedia/vlc/patches/patch-configure | 15 |
5 files changed, 31 insertions, 24 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 261c532b23b..c4d8cf49084 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2009/08/29 13:51:56 hasso Exp $ +# $NetBSD: Makefile,v 1.83 2009/09/24 22:14:57 ahoka Exp $ # DISTNAME= vlc-${VLC_VERSION} @@ -6,7 +6,7 @@ CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ EXTRACT_SUFX= .tar.bz2 -VLC_VERSION= 1.0.1 +VLC_VERSION= 1.0.2 MAINTAINER= ahoka@NetBSD.org HOMEPAGE= http://videolan.org/ diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST index dafeeb5f1ae..21f535111f9 100644 --- a/multimedia/vlc/PLIST +++ b/multimedia/vlc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2009/07/07 19:23:48 ahoka Exp $ +@comment $NetBSD: PLIST,v 1.32 2009/09/24 22:14:57 ahoka Exp $ ${PLIST.altivec}lib/vlc/misc/libmemcpyaltivec_plugin.la ${PLIST.altivec}lib/vlc/video_chroma/libi420_yuy2_altivec_plugin.la ${PLIST.cdda}lib/vlc/access/libcdda_plugin.la @@ -289,7 +289,6 @@ lib/vlc/stream_out/libstream_out_record_plugin.la lib/vlc/stream_out/libstream_out_rtp_plugin.la lib/vlc/stream_out/libstream_out_standard_plugin.la lib/vlc/stream_out/libstream_out_transcode_plugin.la -lib/vlc/stream_out/libstream_out_transrate_plugin.la lib/vlc/video_chroma/libgrey_yuv_plugin.la lib/vlc/video_chroma/libi420_rgb_plugin.la lib/vlc/video_chroma/libi420_ymga_plugin.la diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index ba3e5b38b59..c05ab8bcd9c 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.31 2009/08/30 16:17:13 tnn Exp $ +$NetBSD: distinfo,v 1.32 2009/09/24 22:14:57 ahoka Exp $ -SHA1 (vlc-1.0.1.tar.bz2) = 4bd670f538651633c1115c8f4efc94211ff882ec -RMD160 (vlc-1.0.1.tar.bz2) = 9604d3fd33888a058472ebda711ac17f78f8de3f -Size (vlc-1.0.1.tar.bz2) = 19794042 bytes -SHA1 (patch-aa) = 89f247d455341843abfa2e2294556e64518261ff -SHA1 (patch-configure) = 88a32710eea4987975839bf982d7a6958b977a5c +SHA1 (vlc-1.0.2.tar.bz2) = 5207d227f09d16a44823ae4a8b2144b3ce18eefb +RMD160 (vlc-1.0.2.tar.bz2) = 36f93339d1947483bb5ef4877cbb4b3ab200b3cd +Size (vlc-1.0.2.tar.bz2) = 20958212 bytes +SHA1 (patch-aa) = d1ff094fbfa4f5606b2e1ba27301b681b08ec421 +SHA1 (patch-configure) = 508d9fc4ee8bc8526fb5cdf1b161c573216036c4 SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211 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}" |