Pullup ticket #2901 - requested by ahoka

vlc: security update

Revisions pulled up:
- multimedia/vlc/Makefile			1.83
- multimedia/vlc/PLIST				1.32
- multimedia/vlc/distinfo			1.32
- multimedia/vlc/patches/patch-aa		1.10
- multimedia/vlc/patches/patch-configure	1.4
---
Module Name: pkgsrc
Committed By:	ahoka
Date:	  	Thu Sep 24 22:14:58 UTC 2009

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

Log Message:
Changes between 1.0.1 and 1.0.2:
--------------------------------

Decoders:
 * Native support for WMA Professional, without the use of the Win32 dlls
 * Fix issues in subtitles, especially SSA ones
 * Various fixes on theora and ogg

Demuxers:
 * Various fixes for EPG support in MPEG-TS demuxer
 * Fixes for potential stack overflow in .avi, .mp4 and .asf demuxers

Access:
 * Fixes for v4l2 devices
 * Fixes for dvb-c channels-scanning

Qt Interface:
 * Fix some playlist sorting issues

Mac OS X Interface:
 * Fixed a crash when updating VLC
 * Fixed a crash related to QTKit when opening video files (10.6 only)
 * Added the ability to play 2nd media in sync to the primary item (input-slave)
 * Added the "Quit after Playback" feature

Mac OS X Port:
 * The "Delete Preferences" script is now delivered as a Universal Binary
   with native code for PowerPC, Intel and Intel 64bit
 * Full 64bit runtime compatibility on both Mac OS X 10.5 and 10.6
   - no support for Goom and SDL
   - limited text rendering support
   - This port is still considered as EXPERIMENTAL despite its binary release.

Encoders:
 * MPEG2 transrate stream output removed
 * x264 default-values closer to x264.exe defaults.
 * x264 rc-behaviour fixes:
   - if user defines qp-value, CQP-mode is used
   - otherwise if user defines vb=0, CRF-mode is used
   - otherwise ABR-mode is used
 * x264 set vbv-bufsize/vbv-maxsize better if user hasn't defined these:
   - ABR mode set vbv-max-bitrate=bitrate
   - vbv-bufsize is bitrate * seconds between keyframes (keyint/fps)

Playlist:
 * Lua scripts for Mpora and Vimeo playback

Unix builds:
 * Various fixes to enable 1.0 to build on Solaris and OpenBSD

9 files changed, 152 insertions, 190 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index b1d9083800b..60458d2c6da 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.77.2.1 2009/08/14 14:00:01 tron Exp $
+# $NetBSD: Makefile,v 1.77.2.2 2009/09/28 09:57:01 tron Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		2
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		0.9.9a
+VLC_VERSION=		1.0.2
 
 MAINTAINER=		ahoka@NetBSD.org
 HOMEPAGE=		http://videolan.org/
@@ -23,7 +23,6 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 USE_LANGUAGES=		c99 c++
-USE_DIRS+=		xdg-1.4
 PLIST_VARS+=		x86simd altivec v4l2 vcd cdda
 
 .include "../../mk/bsd.prefs.mk"
@@ -95,31 +94,30 @@ DEFAULT_FONT?=		${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf
 DEPENDS+=		dejavu-ttf>=2.26:../../fonts/dejavu-ttf
 
 SUBST_CLASSES+=		oss
-SUBST_STAGE.oss=	post-patch
+SUBST_STAGE.oss=	pre-configure
 SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
-SUBST_FILES.oss+=	modules/access/v4l.c
-SUBST_FILES.oss+=	modules/access/v4l2/v4l2.c
+SUBST_FILES.oss+=	modules/access/oss.c
 SUBST_FILES.oss+=	modules/audio_output/oss.c
 SUBST_FILES.oss+=	modules/gui/pda/pda_interface.c
 SUBST_FILES.oss+=	modules/gui/pda/pda.glade
-SUBST_FILES.oss+=	test/libvlc/media_list.c
 SUBST_FILES.oss+=	po/*.po
 SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
 
 SUBST_CLASSES+=		fnt
-SUBST_STAGE.fnt=	post-patch
+SUBST_STAGE.fnt=	pre-configure
 SUBST_SED.fnt=		-e "s,${ORIGFNT},${DEFAULT_FONT},"
 SUBST_FILES.fnt=	modules/misc/freetype.c
 SUBST_MESSAGE.fnt=	Fixing hardcoded paths.
 
 REPLACE_SH+=		vlc-config.in.in
 
-# VLC embeds the build environment info to help debuging
+# VLC embeds the build environment info to help debuging.
+# Change it if it's bumped after a VLC upgrade!
 #
 CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 			lib/libvlccore.so \
-			lib/libvlccore.so.0 \
-			lib/libvlccore.so.0.1.0
+			lib/libvlccore.so.2 \
+			lib/libvlccore.so.2.1.0
 
 .include "../../audio/libmpcdec/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index ef5540d5c5a..5099d389e1e 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,53 +1,51 @@
-@comment $NetBSD: PLIST,v 1.29 2009/06/14 20:53:25 joerg Exp $
-${PLIST.faad}lib/vlc/codec/libfaad_plugin.la
+@comment $NetBSD: PLIST,v 1.29.2.1 2009/09/28 09:57:01 tron 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
 ${PLIST.dbus}lib/vlc/control/libdbus_plugin.la
 ${PLIST.dbus}lib/vlc/misc/libinhibit_plugin.la
-${PLIST.dbus}lib/vlc/misc/libtelepathy_plugin.la
+${PLIST.faad}lib/vlc/codec/libfaad_plugin.la
+${PLIST.gnome}lib/vlc/access/libaccess_gnomevfs_plugin.la
+${PLIST.gnome}lib/vlc/misc/libtelepathy_plugin.la
 ${PLIST.hal}lib/vlc/misc/libprobe_hal_plugin.la
 ${PLIST.hal}lib/vlc/services_discovery/libhal_plugin.la
+${PLIST.pulseaudio}lib/vlc/audio_output/libpulse_plugin.la
+${PLIST.sdl}lib/vlc/audio_output/libaout_sdl_plugin.la
+${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.la
+${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.la
+${PLIST.skins}bin/svlc
+${PLIST.skins}lib/vlc/gui/libskins2_plugin.la
+${PLIST.skins}share/vlc/skins2/default.vlt
+${PLIST.skins}share/vlc/skins2/fonts/FreeSans.ttf
+${PLIST.skins}share/vlc/skins2/fonts/FreeSansBold.ttf
+${PLIST.skins}share/vlc/skins2/skin.catalog
+${PLIST.skins}share/vlc/skins2/skin.dtd
+${PLIST.skins}share/vlc/skins2/winamp2.xml
+${PLIST.v4l2}lib/vlc/access/libaccess_v4l2_plugin.la
+${PLIST.vcd}lib/vlc/access/libvcd_plugin.la
 ${PLIST.x11}bin/qvlc
-${PLIST.x11}lib/vlc/gui/libqt4_plugin.la
+${PLIST.x11}lib/vlc/access/libx11_screen_plugin.la
 ${PLIST.x11}lib/vlc/codec/libpng_plugin.la
+${PLIST.x11}lib/vlc/gui/libqt4_plugin.la
 ${PLIST.x11}lib/vlc/misc/libfreetype_plugin.la
 ${PLIST.x11}lib/vlc/misc/libosd_parser_plugin.la
 ${PLIST.x11}lib/vlc/video_filter/libosdmenu_plugin.la
 ${PLIST.x11}lib/vlc/video_filter/libpanoramix_plugin.la
-${PLIST.x11}lib/vlc/video_output/libx11_plugin.la
-${PLIST.x11}lib/vlc/video_output/libxvideo_plugin.la
 ${PLIST.x11}lib/vlc/video_output/libglx_plugin.la
 ${PLIST.x11}lib/vlc/video_output/libopengl_plugin.la
-${PLIST.x11}lib/vlc/misc/libosd_parser_plugin.la
-${PLIST.x11}lib/vlc/access/libscreen_plugin.la
-${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.la
-${PLIST.sdl}lib/vlc/audio_output/libaout_sdl_plugin.la
-${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.la
-${PLIST.arts}lib/vlc/audio_output/libarts_plugin.la
-${PLIST.esound}lib/vlc/audio_output/libesd_plugin.la
-${PLIST.pulseaudio}lib/vlc/audio_output/libpulse_plugin.la
-${PLIST.altivec}lib/vlc/video_chroma/libi420_yuy2_altivec_plugin.la
-${PLIST.altivec}lib/vlc/misc/libmemcpyaltivec_plugin.la
-${PLIST.x86simd}lib/vlc/video_chroma/libi420_rgb_mmx_plugin.la
+${PLIST.x11}lib/vlc/video_output/libsnapshot_plugin.la
+${PLIST.x11}lib/vlc/video_output/libx11_plugin.la
+${PLIST.x11}lib/vlc/video_output/libxvideo_plugin.la
 ${PLIST.x86simd}lib/vlc/misc/libmemcpy3dn_plugin.la
 ${PLIST.x86simd}lib/vlc/misc/libmemcpymmx_plugin.la
 ${PLIST.x86simd}lib/vlc/misc/libmemcpymmxext_plugin.la
-${PLIST.x86simd}lib/vlc/video_chroma/libi420_yuy2_mmx_plugin.la
-${PLIST.x86simd}lib/vlc/video_chroma/libi420_ymga_mmx_plugin.la
-${PLIST.x86simd}lib/vlc/video_chroma/libi422_yuy2_mmx_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi420_rgb_mmx_plugin.la
 ${PLIST.x86simd}lib/vlc/video_chroma/libi420_rgb_sse2_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi420_ymga_mmx_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi420_yuy2_mmx_plugin.la
 ${PLIST.x86simd}lib/vlc/video_chroma/libi420_yuy2_sse2_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi422_yuy2_mmx_plugin.la
 ${PLIST.x86simd}lib/vlc/video_chroma/libi422_yuy2_sse2_plugin.la
-${PLIST.gnome}lib/vlc/access/libaccess_gnomevfs_plugin.la
-${PLIST.v4l2}lib/vlc/access/libaccess_v4l2_plugin.la
-${PLIST.cdda}lib/vlc/access/libcdda_plugin.la
-${PLIST.vcd}lib/vlc/access/libvcd_plugin.la
-${PLIST.skins}bin/svlc
-${PLIST.skins}lib/vlc/gui/libskins2_plugin.la
-${PLIST.skins}share/vlc/skins2/default.vlt
-${PLIST.skins}share/vlc/skins2/fonts/FreeSans.ttf
-${PLIST.skins}share/vlc/skins2/fonts/FreeSansBold.ttf
-${PLIST.skins}share/vlc/skins2/skin.catalog
-${PLIST.skins}share/vlc/skins2/skin.dtd
-${PLIST.skins}share/vlc/skins2/winamp2.xml
 bin/cvlc
 bin/rvlc
 bin/vlc
@@ -55,7 +53,13 @@ bin/vlc-wrapper
 include/vlc/deprecated.h
 include/vlc/libvlc.h
 include/vlc/libvlc_events.h
+include/vlc/libvlc_media.h
+include/vlc/libvlc_media_discoverer.h
+include/vlc/libvlc_media_library.h
 include/vlc/libvlc_media_list.h
+include/vlc/libvlc_media_list_player.h
+include/vlc/libvlc_media_list_view.h
+include/vlc/libvlc_media_player.h
 include/vlc/libvlc_structures.h
 include/vlc/libvlc_vlm.h
 include/vlc/mediacontrol.h
@@ -64,6 +68,7 @@ include/vlc/plugins/vlc_access.h
 include/vlc/plugins/vlc_acl.h
 include/vlc/plugins/vlc_aout.h
 include/vlc/plugins/vlc_arrays.h
+include/vlc/plugins/vlc_avcodec.h
 include/vlc/plugins/vlc_bits.h
 include/vlc/plugins/vlc_block.h
 include/vlc/plugins/vlc_block_helper.h
@@ -74,6 +79,7 @@ include/vlc/plugins/vlc_config.h
 include/vlc/plugins/vlc_config_cat.h
 include/vlc/plugins/vlc_configuration.h
 include/vlc/plugins/vlc_demux.h
+include/vlc/plugins/vlc_dialog.h
 include/vlc/plugins/vlc_epg.h
 include/vlc/plugins/vlc_es.h
 include/vlc/plugins/vlc_es_out.h
@@ -83,6 +89,7 @@ include/vlc/plugins/vlc_gcrypt.h
 include/vlc/plugins/vlc_httpd.h
 include/vlc/plugins/vlc_image.h
 include/vlc/plugins/vlc_input.h
+include/vlc/plugins/vlc_input_item.h
 include/vlc/plugins/vlc_main.h
 include/vlc/plugins/vlc_md5.h
 include/vlc/plugins/vlc_messages.h
@@ -109,6 +116,7 @@ lib/libvlc.la
 lib/libvlccore.la
 lib/pkgconfig/libvlc.pc
 lib/pkgconfig/vlc-plugin.pc
+lib/vlc/access/libaccess_bd_plugin.la
 lib/vlc/access/libaccess_directory_plugin.la
 lib/vlc/access/libaccess_fake_plugin.la
 lib/vlc/access/libaccess_file_plugin.la
@@ -116,16 +124,15 @@ lib/vlc/access/libaccess_ftp_plugin.la
 lib/vlc/access/libaccess_http_plugin.la
 lib/vlc/access/libaccess_mmap_plugin.la
 lib/vlc/access/libaccess_mms_plugin.la
+lib/vlc/access/libaccess_oss_plugin.la
 lib/vlc/access/libaccess_rtmp_plugin.la
 lib/vlc/access/libaccess_tcp_plugin.la
 lib/vlc/access/libaccess_udp_plugin.la
 lib/vlc/access/libcddax_plugin.la
 lib/vlc/access/libdvdnav_plugin.la
 lib/vlc/access/libdvdread_plugin.la
-lib/vlc/access_filter/libaccess_filter_bandwidth_plugin.la
-lib/vlc/access_filter/libaccess_filter_dump_plugin.la
-lib/vlc/access_filter/libaccess_filter_record_plugin.la
-lib/vlc/access_filter/libaccess_filter_timeshift_plugin.la
+lib/vlc/access/librtp_plugin.la
+lib/vlc/access/libzip_plugin.la
 lib/vlc/access_output/libaccess_output_dummy_plugin.la
 lib/vlc/access_output/libaccess_output_file_plugin.la
 lib/vlc/access_output/libaccess_output_http_plugin.la
@@ -138,6 +145,7 @@ lib/vlc/audio_filter/libbandlimited_resampler_plugin.la
 lib/vlc/audio_filter/libconverter_fixed_plugin.la
 lib/vlc/audio_filter/libconverter_float_plugin.la
 lib/vlc/audio_filter/libdolby_surround_decoder_plugin.la
+lib/vlc/audio_filter/libdtstofloat32_plugin.la
 lib/vlc/audio_filter/libdtstospdif_plugin.la
 lib/vlc/audio_filter/libequalizer_plugin.la
 lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.la
@@ -152,7 +160,6 @@ lib/vlc/audio_filter/libspatializer_plugin.la
 lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.la
 lib/vlc/audio_filter/libtrivial_resampler_plugin.la
 lib/vlc/audio_filter/libugly_resampler_plugin.la
-lib/vlc/audio_filter/libdtstofloat32_plugin.la
 lib/vlc/audio_mixer/libfloat32_mixer_plugin.la
 lib/vlc/audio_mixer/libspdif_mixer_plugin.la
 lib/vlc/audio_mixer/libtrivial_mixer_plugin.la
@@ -160,17 +167,18 @@ lib/vlc/audio_output/libaout_file_plugin.la
 lib/vlc/audio_output/liboss_plugin.la
 lib/vlc/codec/liba52_plugin.la
 lib/vlc/codec/libadpcm_plugin.la
+lib/vlc/codec/libaes3_plugin.la
 lib/vlc/codec/libaraw_plugin.la
 lib/vlc/codec/libavcodec_plugin.la
 lib/vlc/codec/libcc_plugin.la
 lib/vlc/codec/libcdg_plugin.la
-lib/vlc/codec/libcinepak_plugin.la
 lib/vlc/codec/libcmml_plugin.la
 lib/vlc/codec/libcvdsub_plugin.la
 lib/vlc/codec/libdts_plugin.la
 lib/vlc/codec/libdvbsub_plugin.la
 lib/vlc/codec/libfake_plugin.la
 lib/vlc/codec/libflac_plugin.la
+lib/vlc/codec/libinvmem_plugin.la
 lib/vlc/codec/liblibmpeg2_plugin.la
 lib/vlc/codec/liblpcm_plugin.la
 lib/vlc/codec/libmpeg_audio_plugin.la
@@ -181,8 +189,8 @@ lib/vlc/codec/libsubsusf_plugin.la
 lib/vlc/codec/libsvcdsub_plugin.la
 lib/vlc/codec/libt140_plugin.la
 lib/vlc/codec/libtelx_plugin.la
-lib/vlc/codec/libvorbis_plugin.la
 lib/vlc/codec/libtheora_plugin.la
+lib/vlc/codec/libvorbis_plugin.la
 lib/vlc/codec/libx264_plugin.la
 lib/vlc/control/libgestures_plugin.la
 lib/vlc/control/libhotkeys_plugin.la
@@ -192,7 +200,6 @@ lib/vlc/control/librc_plugin.la
 lib/vlc/control/libshowintf_plugin.la
 lib/vlc/control/libsignals_plugin.la
 lib/vlc/control/libtelnet_plugin.la
-lib/vlc/demux/liba52sys_plugin.la
 lib/vlc/demux/libaiff_plugin.la
 lib/vlc/demux/libasf_plugin.la
 lib/vlc/demux/libau_plugin.la
@@ -200,17 +207,16 @@ lib/vlc/demux/libavformat_plugin.la
 lib/vlc/demux/libavi_plugin.la
 lib/vlc/demux/libdemux_cdg_plugin.la
 lib/vlc/demux/libdemuxdump_plugin.la
-lib/vlc/demux/libdtssys_plugin.la
+lib/vlc/demux/libdirac_plugin.la
+lib/vlc/demux/libes_plugin.la
 lib/vlc/demux/libflacsys_plugin.la
 lib/vlc/demux/libh264_plugin.la
 lib/vlc/demux/liblive555_plugin.la
-lib/vlc/demux/libm4a_plugin.la
 lib/vlc/demux/libm4v_plugin.la
 lib/vlc/demux/libmjpeg_plugin.la
 lib/vlc/demux/libmkv_plugin.la
 lib/vlc/demux/libmp4_plugin.la
 lib/vlc/demux/libmpc_plugin.la
-lib/vlc/demux/libmpga_plugin.la
 lib/vlc/demux/libmpgv_plugin.la
 lib/vlc/demux/libnsc_plugin.la
 lib/vlc/demux/libnsv_plugin.la
@@ -219,10 +225,10 @@ lib/vlc/demux/libogg_plugin.la
 lib/vlc/demux/libplaylist_plugin.la
 lib/vlc/demux/libps_plugin.la
 lib/vlc/demux/libpva_plugin.la
+lib/vlc/demux/librawaud_plugin.la
 lib/vlc/demux/librawdv_plugin.la
 lib/vlc/demux/librawvid_plugin.la
 lib/vlc/demux/libreal_plugin.la
-lib/vlc/demux/librtp_plugin.la
 lib/vlc/demux/libsmf_plugin.la
 lib/vlc/demux/libsubtitle_plugin.la
 lib/vlc/demux/libts_plugin.la
@@ -234,7 +240,6 @@ lib/vlc/demux/libvoc_plugin.la
 lib/vlc/demux/libwav_plugin.la
 lib/vlc/demux/libxa_plugin.la
 lib/vlc/meta_engine/libfolder_plugin.la
-lib/vlc/meta_engine/libid3tag_plugin.la
 lib/vlc/meta_engine/libtaglib_plugin.la
 lib/vlc/misc/libaudioscrobbler_plugin.la
 lib/vlc/misc/libdummy_plugin.la
@@ -257,7 +262,9 @@ lib/vlc/mux/libmux_ps_plugin.la
 lib/vlc/mux/libmux_ts_plugin.la
 lib/vlc/mux/libmux_wav_plugin.la
 lib/vlc/packetizer/libpacketizer_copy_plugin.la
+lib/vlc/packetizer/libpacketizer_dirac_plugin.la
 lib/vlc/packetizer/libpacketizer_h264_plugin.la
+lib/vlc/packetizer/libpacketizer_mlp_plugin.la
 lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.la
 lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.la
 lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.la
@@ -265,6 +272,9 @@ lib/vlc/packetizer/libpacketizer_vc1_plugin.la
 lib/vlc/services_discovery/libpodcast_plugin.la
 lib/vlc/services_discovery/libsap_plugin.la
 lib/vlc/services_discovery/libshout_plugin.la
+lib/vlc/stream_filter/libdecomp_plugin.la
+lib/vlc/stream_filter/libstream_filter_rar_plugin.la
+lib/vlc/stream_filter/libstream_filter_record_plugin.la
 lib/vlc/stream_out/libstream_out_autodel_plugin.la
 lib/vlc/stream_out/libstream_out_bridge_plugin.la
 lib/vlc/stream_out/libstream_out_description_plugin.la
@@ -274,6 +284,8 @@ lib/vlc/stream_out/libstream_out_duplicate_plugin.la
 lib/vlc/stream_out/libstream_out_es_plugin.la
 lib/vlc/stream_out/libstream_out_gather_plugin.la
 lib/vlc/stream_out/libstream_out_mosaic_bridge_plugin.la
+lib/vlc/stream_out/libstream_out_raop_plugin.la
+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
@@ -320,18 +332,19 @@ lib/vlc/video_filter/librotate_plugin.la
 lib/vlc/video_filter/librss_plugin.la
 lib/vlc/video_filter/librv32_plugin.la
 lib/vlc/video_filter/libscale_plugin.la
+lib/vlc/video_filter/libscene_plugin.la
 lib/vlc/video_filter/libsharpen_plugin.la
 lib/vlc/video_filter/libswscale_plugin.la
 lib/vlc/video_filter/libtransform_plugin.la
 lib/vlc/video_filter/libwall_plugin.la
 lib/vlc/video_filter/libwave_plugin.la
-lib/vlc/video_output/libimage_plugin.la
-lib/vlc/video_output/libsnapshot_plugin.la
+lib/vlc/video_filter/libyuvp_plugin.la
+lib/vlc/video_output/libdrawable_plugin.la
 lib/vlc/video_output/libvmem_plugin.la
+lib/vlc/video_output/libyuv_plugin.la
 lib/vlc/visualization/libvisual_plugin.la
-lib/vlc/demux/libmpc_plugin.la
-lib/vlc/misc/libgnutls_plugin.la
 man/man1/vlc-config.1
+man/man1/vlc-wrapper.1
 man/man1/vlc.1
 share/applications/vlc.desktop
 share/doc/vlc/bugreport-howto.txt
@@ -343,6 +356,7 @@ share/locale/ar/LC_MESSAGES/vlc.mo
 share/locale/bg/LC_MESSAGES/vlc.mo
 share/locale/bn/LC_MESSAGES/vlc.mo
 share/locale/ca/LC_MESSAGES/vlc.mo
+share/locale/ckb/LC_MESSAGES/vlc.mo
 share/locale/co/LC_MESSAGES/vlc.mo
 share/locale/cs/LC_MESSAGES/vlc.mo
 share/locale/da/LC_MESSAGES/vlc.mo
@@ -350,6 +364,7 @@ share/locale/de/LC_MESSAGES/vlc.mo
 share/locale/el/LC_MESSAGES/vlc.mo
 share/locale/en_GB/LC_MESSAGES/vlc.mo
 share/locale/es/LC_MESSAGES/vlc.mo
+share/locale/et/LC_MESSAGES/vlc.mo
 share/locale/eu/LC_MESSAGES/vlc.mo
 share/locale/fa/LC_MESSAGES/vlc.mo
 share/locale/fi/LC_MESSAGES/vlc.mo
@@ -358,20 +373,23 @@ share/locale/fur/LC_MESSAGES/vlc.mo
 share/locale/gl/LC_MESSAGES/vlc.mo
 share/locale/he/LC_MESSAGES/vlc.mo
 share/locale/hi/LC_MESSAGES/vlc.mo
+share/locale/hr/LC_MESSAGES/vlc.mo
 share/locale/hu/LC_MESSAGES/vlc.mo
 share/locale/id/LC_MESSAGES/vlc.mo
 share/locale/it/LC_MESSAGES/vlc.mo
 share/locale/ja/LC_MESSAGES/vlc.mo
 share/locale/ka/LC_MESSAGES/vlc.mo
+share/locale/kk/LC_MESSAGES/vlc.mo
+share/locale/km/LC_MESSAGES/vlc.mo
 share/locale/ko/LC_MESSAGES/vlc.mo
 share/locale/lt/LC_MESSAGES/vlc.mo
 share/locale/lv/LC_MESSAGES/vlc.mo
+share/locale/mn/LC_MESSAGES/vlc.mo
 share/locale/ms/LC_MESSAGES/vlc.mo
 share/locale/my/LC_MESSAGES/vlc.mo
 share/locale/nb/LC_MESSAGES/vlc.mo
 share/locale/ne/LC_MESSAGES/vlc.mo
 share/locale/nl/LC_MESSAGES/vlc.mo
-share/locale/no/LC_MESSAGES/vlc.mo
 share/locale/oc/LC_MESSAGES/vlc.mo
 share/locale/pa/LC_MESSAGES/vlc.mo
 share/locale/pl/LC_MESSAGES/vlc.mo
@@ -390,6 +408,7 @@ share/locale/th/LC_MESSAGES/vlc.mo
 share/locale/tl/LC_MESSAGES/vlc.mo
 share/locale/tr/LC_MESSAGES/vlc.mo
 share/locale/uk/LC_MESSAGES/vlc.mo
+share/locale/vi/LC_MESSAGES/vlc.mo
 share/locale/zh_CN/LC_MESSAGES/vlc.mo
 share/locale/zh_TW/LC_MESSAGES/vlc.mo
 share/vlc/http/.hosts
@@ -446,21 +465,6 @@ share/vlc/http/js/functions.js
 share/vlc/http/js/mosaic.js
 share/vlc/http/js/vlm.js
 share/vlc/http/mosaic.html
-share/vlc/http/old/.hosts
-share/vlc/http/old/admin/.access
-share/vlc/http/old/admin/browse.html
-share/vlc/http/old/admin/dboxfiles.html
-share/vlc/http/old/admin/index.html
-share/vlc/http/old/cone_minus.png
-share/vlc/http/old/cone_plus.png
-share/vlc/http/old/index.html
-share/vlc/http/old/info.html
-share/vlc/http/old/style.css
-share/vlc/http/old/vlm/edit.html
-share/vlc/http/old/vlm/index.html
-share/vlc/http/old/vlm/new.html
-share/vlc/http/old/vlm/show.html
-share/vlc/http/old/webcam.html
 share/vlc/http/requests/browse.xml
 share/vlc/http/requests/playlist.xml
 share/vlc/http/requests/readme
@@ -499,48 +503,10 @@ share/vlc/osdmenu/default/volume/volume_07.png
 share/vlc/osdmenu/default/volume/volume_08.png
 share/vlc/osdmenu/default/volume/volume_09.png
 share/vlc/osdmenu/default/volume/volume_10.png
-share/vlc/osdmenu/dvd.cfg
-share/vlc/osdmenu/dvd/selected/bw.png
-share/vlc/osdmenu/dvd/selected/esc.png
-share/vlc/osdmenu/dvd/selected/fw.png
-share/vlc/osdmenu/dvd/selected/mute.png
-share/vlc/osdmenu/dvd/selected/next.png
-share/vlc/osdmenu/dvd/selected/pause.png
-share/vlc/osdmenu/dvd/selected/play.png
-share/vlc/osdmenu/dvd/selected/previous.png
-share/vlc/osdmenu/dvd/selected/slow.png
-share/vlc/osdmenu/dvd/selected/stop.png
-share/vlc/osdmenu/dvd/selected/volume.png
-share/vlc/osdmenu/dvd/selection/bw.png
-share/vlc/osdmenu/dvd/selection/esc.png
-share/vlc/osdmenu/dvd/selection/fw.png
-share/vlc/osdmenu/dvd/selection/mute.png
-share/vlc/osdmenu/dvd/selection/next.png
-share/vlc/osdmenu/dvd/selection/pause.png
-share/vlc/osdmenu/dvd/selection/play.png
-share/vlc/osdmenu/dvd/selection/previous.png
-share/vlc/osdmenu/dvd/selection/slow.png
-share/vlc/osdmenu/dvd/selection/stop.png
-share/vlc/osdmenu/dvd/unselect/barroff.png
-share/vlc/osdmenu/dvd/volume/volume00.png
-share/vlc/osdmenu/dvd/volume/volume01.png
-share/vlc/osdmenu/dvd/volume/volume02.png
-share/vlc/osdmenu/dvd/volume/volume03.png
-share/vlc/osdmenu/dvd/volume/volume04.png
-share/vlc/osdmenu/dvd/volume/volume05.png
-share/vlc/osdmenu/minimal.cfg
-share/vlc/osdmenu/minimal/fs_panel.png
-share/vlc/osdmenu/minimal/fs_panel.xcf
-share/vlc/osdmenu/minimal/fs_panel_mockup.png
-share/vlc/osdmenu/minimal/fs_panel_simple.png
-share/vlc/osdmenu/minimal/fs_panel_simple.xcf
-share/vlc/osdmenu/minimal/fs_panel_skip_next.png
-share/vlc/osdmenu/minimal/fs_panel_skip_previous.png
-share/vlc/osdmenu/minimal/fs_panel_volume_max.png
-share/vlc/osdmenu/minimal/fs_panel_volume_min.png
 share/vlc/utils/audio-vlc-default.sh
 share/vlc/utils/gnome-vlc-default.sh
 share/vlc/utils/video-vlc-default.sh
+share/vlc/vlc.ico
 share/vlc/vlc128x128-christmas.png
 share/vlc/vlc128x128.png
 share/vlc/vlc16x16.png
@@ -549,6 +515,10 @@ share/vlc/vlc32x32-christmas.xpm
 share/vlc/vlc32x32.png
 share/vlc/vlc32x32.xpm
 share/vlc/vlc48x48-christmas.png
-share/vlc/vlc48x48.ico
 share/vlc/vlc48x48.png
-@pkgdir share/vlc/skins2/fonts
+@pkgdir share/vlc/osdmenu/dvd/volume
+@pkgdir share/vlc/osdmenu/dvd/unselect
+@pkgdir share/vlc/osdmenu/dvd/selection
+@pkgdir share/vlc/osdmenu/dvd/selected
+@pkgdir share/vlc/http/old/vlm
+@pkgdir share/vlc/http/old/admin
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index 06473db9862..b76e1e6c9ee 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.26 2009/06/12 17:24:54 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.26.2.1 2009/09/28 09:57:01 tron Exp $
 
 BUILDLINK_TREE+=	vlc
 
 .if !defined(VLC_BUILDLINK3_MK)
 VLC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.vlc+=	vlc>=0.8.6d
-BUILDLINK_ABI_DEPENDS.vlc?=	vlc>=0.9.9anb1
+BUILDLINK_API_DEPENDS.vlc?=	vlc>=1.0.0
+BUILDLINK_ABI_DEPENDS.vlc?=	vlc>=1.0.0nb1
 BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
 
 pkgbase:= vlc
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 94d100348df..b26b4a2bcdb 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.27.2.1 2009/08/14 14:00:01 tron Exp $
+$NetBSD: distinfo,v 1.27.2.2 2009/09/28 09:57:01 tron Exp $
 
-SHA1 (vlc-0.9.9a.tar.bz2) = c72a3aa7854292356c0c5149cbb732da7d46b163
-RMD160 (vlc-0.9.9a.tar.bz2) = c185b5e8dae8e8aacb6e1c03f14eae24cb805648
-Size (vlc-0.9.9a.tar.bz2) = 17500620 bytes
-SHA1 (patch-aa) = 49157d57e4e7755be87b22234d6c04ef997f91b6
-SHA1 (patch-configure) = 0b69157981409067b42385ee5c81fc422f3842a2
-SHA1 (patch-embedded-video) = 82c59d4bc62c22015cb6923fd1202a598525575d
-SHA1 (patch-v4l2) = 54504b7e3bc41522db5c90983319c0c1ce1f3c8f
+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/options.mk b/multimedia/vlc/options.mk
index 38291abbadb..30432aa6864 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,21 +1,13 @@
-# $NetBSD: options.mk,v 1.13 2008/12/25 18:21:59 jmcneill Exp $
+# $NetBSD: options.mk,v 1.13.6.1 2009/09/28 09:57:01 tron Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS=		debug faad arts dbus hal skins sdl esound pulseaudio x11 gnome
-PKG_SUGGESTED_OPTIONS=		x11 esound pulseaudio
+PKG_SUPPORTED_OPTIONS=		debug faad dbus hal skins sdl pulseaudio x11 gnome
+PKG_SUGGESTED_OPTIONS=		x11 pulseaudio
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
 
-## ESOUND audio backend
-
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=	--enable-esd
-.include "../../audio/esound/buildlink3.mk"
-PLIST.esound=		yes
-.endif
-
 ## PulseAudio support
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
@@ -37,7 +29,7 @@ CONFIGURE_ARGS+=	--disable-sdl
 CONFIGURE_ARGS+=	--disable-sdl-image
 .endif
 
-## gnome-vfs support
+## gnome integration
 
 .if !empty(PKG_OPTIONS:Mgnome)
 CONFIGURE_ARGS+=	--enable-gnomevfs
@@ -56,7 +48,17 @@ CONFIGURE_ARGS+=	--enable-dbus
 .include "../../sysutils/dbus/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-notify
 .include "../../sysutils/libnotify/buildlink3.mk"
+
+# telepathy needs dbus, but its also gnome-ish
+.if !empty(PKG_OPTIONS:Mgnome)
+.include "../../chat/libtelepathy/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-telepathy
+.else
+CONFIGURE_ARGS+=	--disable-telepathy
+.endif
+
 PLIST.dbus=		yes
+
 ## HAL support (requires dbus)
 .if !empty(PKG_OPTIONS:Mhal)
 CONFIGURE_ARGS+=	--enable-hal
@@ -124,13 +126,3 @@ PLIST.faad=		yes
 .else
 CONFIGURE_ARGS+=	--disable-faad
 .endif
-
-## ARTS audio system support
-
-.if !empty(PKG_OPTIONS:Marts)
-CONFIGURE_ARGS+=	--enable-arts
-PLIST.arts=		yes
-.include "../../audio/arts/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-arts
-.endif
diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa
index 1708de9472a..4aea379ab38 100644
--- a/multimedia/vlc/patches/patch-aa
+++ b/multimedia/vlc/patches/patch-aa
@@ -1,11 +1,27 @@
---- modules/access/rtsp/real.c.orig	2009-08-09 13:00:43.000000000 +0300
-+++ modules/access/rtsp/real.c	2009-08-09 13:01:54.000000000 +0300
-@@ -592,6 +592,8 @@ int real_get_rdt_chunk(rtsp_client_t *rt
+$NetBSD: patch-aa,v 1.7.2.3 2009/09/28 09:57:01 tron Exp $
+
+--- modules/access/file.c.orig	2009-09-18 18:37:45.000000000 +0200
++++ modules/access/file.c
+@@ -50,6 +50,8 @@
+ #if defined (__linux__)
+ #   include <sys/vfs.h>
+ #   include <linux/magic.h>
++#elif defined (HAVE_FSTATVFS)
++#   include <sys/statvfs.h>
+ #elif defined (HAVE_SYS_MOUNT_H)
+ #   include <sys/param.h>
+ #   include <sys/mount.h>
+@@ -126,7 +128,12 @@ struct access_sys_t
  
-   int n;
-   rmff_dump_pheader(ph, (char*)*buffer);
-+  if (ph->length < 12)
-+	return 0;
-   n=rtsp_read_data(rtsp_session, (uint8_t*)(*buffer + 12), ph->length - 12);
-   return (n <= 0) ? 0 : n+12;
- }
+ 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);
++#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 6f0201ece05..d947363a6aa 100644
--- a/multimedia/vlc/patches/patch-configure
+++ b/multimedia/vlc/patches/patch-configure
@@ -1,17 +1,17 @@
-$NetBSD: patch-configure,v 1.2 2008/10/13 18:42:12 ahoka Exp $
+$NetBSD: patch-configure,v 1.2.6.1 2009/09/28 09:57:01 tron Exp $
 
---- configure.ac.orig	2008-10-06 20:14:27.000000000 +0200
+--- configure.ac.orig	2009-09-19 21:30:21.000000000 +0200
 +++ configure.ac
-@@ -1592,7 +1592,7 @@ dnl Allow runing as root (usefull for pe
- dnl
- AC_ARG_ENABLE(run-as-root,
- [  --enable-run-as-root    allow runing VLC as root (default disabled)])
--AS_IF([test "${enable_run_as_root}" == "yes"],[
-+AS_IF([test "${enable_run_as_root}" = "yes"],[
-     AC_DEFINE(ALLOW_RUN_AS_ROOT, 1,
-               [Define to 1 to allow runing VLC as root (uid 0).])
+@@ -572,7 +572,7 @@ AC_CHECK_FUNCS(fdatasync,,
  ])
-@@ -2424,7 +2424,7 @@ then
+ 
+ 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}"
diff --git a/multimedia/vlc/patches/patch-embedded-video b/multimedia/vlc/patches/patch-embedded-video
deleted file mode 100644
index 5d14039b436..00000000000
--- a/multimedia/vlc/patches/patch-embedded-video
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-embedded-video,v 1.1 2009/01/28 12:28:25 jmcneill Exp $
-
---- modules/gui/qt4/qt4.cpp.orig	2008-11-09 13:11:18.000000000 -0500
-+++ modules/gui/qt4/qt4.cpp
-@@ -213,7 +213,7 @@ vlc_module_begin();
- 
-         set_callbacks( OpenDialogs, Close );
- 
--#if 0
-+#if !defined(Q_QS_X11) || HAS_QT43
-     add_submodule();
-         set_capability( "vout window", 50 );
-         set_callbacks( WindowOpen, WindowClose );
diff --git a/multimedia/vlc/patches/patch-v4l2 b/multimedia/vlc/patches/patch-v4l2
index cce3aba1668..95f357ca583 100644
--- a/multimedia/vlc/patches/patch-v4l2
+++ b/multimedia/vlc/patches/patch-v4l2
@@ -1,8 +1,8 @@
-$NetBSD: patch-v4l2,v 1.1 2008/09/27 22:33:20 ahoka Exp $
+$NetBSD: patch-v4l2,v 1.1.8.1 2009/09/28 09:57:01 tron Exp $
 
---- modules/access/v4l2/v4l2.c.orig	2008-09-25 01:46:12.000000000 +0200
-+++ modules/access/v4l2/v4l2.c
-@@ -55,7 +55,13 @@
+--- modules/access/v4l2.c.orig	2009-05-22 01:06:04.000000000 +0200
++++ modules/access/v4l2.c
+@@ -48,7 +48,13 @@
  #include <sys/ioctl.h>
  #include <sys/mman.h>
  
@@ -15,5 +15,5 @@ $NetBSD: patch-v4l2,v 1.1 2008/09/27 22:33:20 ahoka Exp $
 +#   error "No Video4Linux2 headers found."
 +#endif
  
- #include <sys/soundcard.h>
+ #include <poll.h>