update to 1.1.6, from Makoto Fujiwara per pkgsrc-wip

This is a new major branch, too many changes to list here.
(the options need testing and cleanup)

13 files changed, 582 insertions, 391 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 4b174270c35..b673375da8d 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.101 2011/01/13 13:53:30 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2011/01/24 18:54:04 drochner Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		6
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		1.0.6
+VLC_VERSION=		1.1.6
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
@@ -94,14 +93,14 @@ post-install:
 ORIGFNT=		/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
 DEFAULT_FONT?=		${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf
 DEPENDS+=		dejavu-ttf>=2.26:../../fonts/dejavu-ttf
+# libX11 should be built with xcb enabled
+DEPENDS+=		libX11>=1.3.5:../../x11/libX11
 
 SUBST_CLASSES+=		oss
 SUBST_STAGE.oss=	pre-configure
 SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 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+=	po/*.po
 SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
 
@@ -118,8 +117,8 @@ REPLACE_SH+=		vlc-config.in.in
 #
 CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 			lib/libvlccore.so \
-			lib/libvlccore.so.2 \
-			lib/libvlccore.so.2.1.2
+			lib/libvlccore.so.4 \
+			lib/libvlccore.so.4.0.1
 
 .include "../../audio/libmpcdec/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
@@ -153,8 +152,9 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 # needs x264_encoder_delayed_frames
-BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20090920
+BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20100201
 .include "../../multimedia/x264-devel/buildlink3.mk"
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index ab7ed207dd1..922c1ad0a07 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,53 +1,6 @@
-@comment $NetBSD: PLIST,v 1.36 2010/09/15 12:36:49 wiz 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.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/access/libx11_screen_plugin.la
-${PLIST.x11}lib/vlc/codec/libpng_plugin.la
-${PLIST.x11}lib/vlc/control/libglobalhotkeys_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/libglx_plugin.la
-${PLIST.x11}lib/vlc/video_output/libopengl_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_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
+@comment $NetBSD: PLIST,v 1.37 2011/01/24 18:54:04 drochner Exp $
 bin/cvlc
+bin/qvlc
 bin/rvlc
 bin/vlc
 bin/vlc-wrapper
@@ -59,16 +12,16 @@ 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_version.h
 include/vlc/libvlc_vlm.h
-include/vlc/mediacontrol.h
-include/vlc/mediacontrol_structures.h
 include/vlc/plugins/vlc_access.h
 include/vlc/plugins/vlc_acl.h
 include/vlc/plugins/vlc_aout.h
+include/vlc/plugins/vlc_aout_mixer.h
 include/vlc/plugins/vlc_arrays.h
+include/vlc/plugins/vlc_art_finder.h
 include/vlc/plugins/vlc_avcodec.h
 include/vlc/plugins/vlc_bits.h
 include/vlc/plugins/vlc_block.h
@@ -79,6 +32,7 @@ include/vlc/plugins/vlc_common.h
 include/vlc/plugins/vlc_config.h
 include/vlc/plugins/vlc_config_cat.h
 include/vlc/plugins/vlc_configuration.h
+include/vlc/plugins/vlc_cpu.h
 include/vlc/plugins/vlc_demux.h
 include/vlc/plugins/vlc_dialog.h
 include/vlc/plugins/vlc_epg.h
@@ -86,9 +40,13 @@ include/vlc/plugins/vlc_es.h
 include/vlc/plugins/vlc_es_out.h
 include/vlc/plugins/vlc_events.h
 include/vlc/plugins/vlc_filter.h
+include/vlc/plugins/vlc_fourcc.h
+include/vlc/plugins/vlc_fs.h
 include/vlc/plugins/vlc_gcrypt.h
+include/vlc/plugins/vlc_http.h
 include/vlc/plugins/vlc_httpd.h
 include/vlc/plugins/vlc_image.h
+include/vlc/plugins/vlc_inhibit.h
 include/vlc/plugins/vlc_input.h
 include/vlc/plugins/vlc_input_item.h
 include/vlc/plugins/vlc_main.h
@@ -96,262 +54,315 @@ include/vlc/plugins/vlc_md5.h
 include/vlc/plugins/vlc_messages.h
 include/vlc/plugins/vlc_meta.h
 include/vlc/plugins/vlc_modules.h
+include/vlc/plugins/vlc_mouse.h
 include/vlc/plugins/vlc_mtime.h
 include/vlc/plugins/vlc_objects.h
+include/vlc/plugins/vlc_picture.h
+include/vlc/plugins/vlc_picture_fifo.h
+include/vlc/plugins/vlc_picture_pool.h
 include/vlc/plugins/vlc_playlist.h
 include/vlc/plugins/vlc_plugin.h
+include/vlc/plugins/vlc_probe.h
 include/vlc/plugins/vlc_rand.h
 include/vlc/plugins/vlc_services_discovery.h
 include/vlc/plugins/vlc_sout.h
+include/vlc/plugins/vlc_sql.h
 include/vlc/plugins/vlc_stream.h
 include/vlc/plugins/vlc_strings.h
+include/vlc/plugins/vlc_subpicture.h
 include/vlc/plugins/vlc_threads.h
 include/vlc/plugins/vlc_url.h
 include/vlc/plugins/vlc_variables.h
+include/vlc/plugins/vlc_video_splitter.h
 include/vlc/plugins/vlc_vlm.h
 include/vlc/plugins/vlc_vout.h
-include/vlc/plugins/vlc_window.h
+include/vlc/plugins/vlc_vout_display.h
+include/vlc/plugins/vlc_vout_opengl.h
+include/vlc/plugins/vlc_vout_window.h
+include/vlc/plugins/vlc_xlib.h
 include/vlc/plugins/vlc_xml.h
 include/vlc/vlc.h
 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
-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_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/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
-lib/vlc/access_output/libaccess_output_udp_plugin.la
-lib/vlc/audio_filter/liba52tofloat32_plugin.la
-lib/vlc/audio_filter/liba52tospdif_plugin.la
-lib/vlc/audio_filter/libaudio_format_plugin.la
-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
-lib/vlc/audio_filter/liblinear_resampler_plugin.la
-lib/vlc/audio_filter/libmono_plugin.la
-lib/vlc/audio_filter/libmpgatofixed32_plugin.la
-lib/vlc/audio_filter/libnormvol_plugin.la
-lib/vlc/audio_filter/libparam_eq_plugin.la
-lib/vlc/audio_filter/libscaletempo_plugin.la
-lib/vlc/audio_filter/libsimple_channel_mixer_plugin.la
-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_mixer/libfloat32_mixer_plugin.la
-lib/vlc/audio_mixer/libspdif_mixer_plugin.la
-lib/vlc/audio_mixer/libtrivial_mixer_plugin.la
-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/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
-lib/vlc/codec/librawvideo_plugin.la
-lib/vlc/codec/libspudec_plugin.la
-lib/vlc/codec/libsubsdec_plugin.la
-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/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
-lib/vlc/control/libhttp_plugin.la
-lib/vlc/control/libmotion_plugin.la
-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/libaiff_plugin.la
-lib/vlc/demux/libasf_plugin.la
-lib/vlc/demux/libau_plugin.la
-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/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/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/libmpgv_plugin.la
-lib/vlc/demux/libnsc_plugin.la
-lib/vlc/demux/libnsv_plugin.la
-lib/vlc/demux/libnuv_plugin.la
-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/libsmf_plugin.la
-lib/vlc/demux/libsubtitle_plugin.la
-lib/vlc/demux/libts_plugin.la
-lib/vlc/demux/libtta_plugin.la
-lib/vlc/demux/libty_plugin.la
-lib/vlc/demux/libvc1_plugin.la
-lib/vlc/demux/libvobsub_plugin.la
-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/libtaglib_plugin.la
-lib/vlc/misc/libaudioscrobbler_plugin.la
-lib/vlc/misc/libdummy_plugin.la
-lib/vlc/misc/libexport_plugin.la
-lib/vlc/misc/libgnutls_plugin.la
-lib/vlc/misc/liblogger_plugin.la
-lib/vlc/misc/libmemcpy_plugin.la
-lib/vlc/misc/libscreensaver_plugin.la
-lib/vlc/misc/libstats_plugin.la
-lib/vlc/misc/libvod_rtsp_plugin.la
-lib/vlc/misc/libxml_plugin.la
-lib/vlc/misc/libxtag_plugin.la
-lib/vlc/mux/libmux_asf_plugin.la
-lib/vlc/mux/libmux_avi_plugin.la
-lib/vlc/mux/libmux_dummy_plugin.la
-lib/vlc/mux/libmux_mp4_plugin.la
-lib/vlc/mux/libmux_mpjpeg_plugin.la
-lib/vlc/mux/libmux_ogg_plugin.la
-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
-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
-lib/vlc/stream_out/libstream_out_display_plugin.la
-lib/vlc/stream_out/libstream_out_dummy_plugin.la
-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
-lib/vlc/video_chroma/libgrey_yuv_plugin.la
-lib/vlc/video_chroma/libi420_rgb_plugin.la
-lib/vlc/video_chroma/libi420_ymga_plugin.la
-lib/vlc/video_chroma/libi420_yuy2_plugin.la
-lib/vlc/video_chroma/libi422_i420_plugin.la
-lib/vlc/video_chroma/libi422_yuy2_plugin.la
-lib/vlc/video_chroma/libyuy2_i420_plugin.la
-lib/vlc/video_chroma/libyuy2_i422_plugin.la
-lib/vlc/video_filter/libadjust_plugin.la
-lib/vlc/video_filter/libalphamask_plugin.la
-lib/vlc/video_filter/libblend_plugin.la
-lib/vlc/video_filter/libblendbench_plugin.la
-lib/vlc/video_filter/libbluescreen_plugin.la
-lib/vlc/video_filter/libcanvas_plugin.la
-lib/vlc/video_filter/libchain_plugin.la
-lib/vlc/video_filter/libclone_plugin.la
-lib/vlc/video_filter/libcolorthres_plugin.la
-lib/vlc/video_filter/libcrop_plugin.la
-lib/vlc/video_filter/libcroppadd_plugin.la
-lib/vlc/video_filter/libdeinterlace_plugin.la
-lib/vlc/video_filter/libdynamicoverlay_plugin.la
-lib/vlc/video_filter/liberase_plugin.la
-lib/vlc/video_filter/libextract_plugin.la
-lib/vlc/video_filter/libgaussianblur_plugin.la
-lib/vlc/video_filter/libgradient_plugin.la
-lib/vlc/video_filter/libgrain_plugin.la
-lib/vlc/video_filter/libinvert_plugin.la
-lib/vlc/video_filter/liblogo_plugin.la
-lib/vlc/video_filter/libmagnify_plugin.la
-lib/vlc/video_filter/libmarq_plugin.la
-lib/vlc/video_filter/libmosaic_plugin.la
-lib/vlc/video_filter/libmotionblur_plugin.la
-lib/vlc/video_filter/libmotiondetect_plugin.la
-lib/vlc/video_filter/libnoise_plugin.la
-lib/vlc/video_filter/libpostproc_plugin.la
-lib/vlc/video_filter/libpsychedelic_plugin.la
-lib/vlc/video_filter/libpuzzle_plugin.la
-lib/vlc/video_filter/libremoteosd_plugin.la
-lib/vlc/video_filter/libripple_plugin.la
-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_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/plugins/3dnow/libmemcpy3dn_plugin.la
+lib/vlc/plugins/access/libaccess_attachment_plugin.la
+lib/vlc/plugins/access/libaccess_avio_plugin.la
+lib/vlc/plugins/access/libaccess_bd_plugin.la
+lib/vlc/plugins/access/libaccess_fake_plugin.la
+lib/vlc/plugins/access/libaccess_ftp_plugin.la
+lib/vlc/plugins/access/libaccess_http_plugin.la
+lib/vlc/plugins/access/libaccess_imem_plugin.la
+lib/vlc/plugins/access/libaccess_mmap_plugin.la
+lib/vlc/plugins/access/libaccess_mms_plugin.la
+lib/vlc/plugins/access/libaccess_oss_plugin.la
+lib/vlc/plugins/access/libaccess_tcp_plugin.la
+lib/vlc/plugins/access/libaccess_udp_plugin.la
+lib/vlc/plugins/access/libdvdnav_plugin.la
+lib/vlc/plugins/access/libdvdread_plugin.la
+lib/vlc/plugins/access/libfilesystem_plugin.la
+lib/vlc/plugins/access/librtp_plugin.la
+lib/vlc/plugins/access/libxcb_screen_plugin.la
+lib/vlc/plugins/access/libzip_plugin.la
+lib/vlc/plugins/access_output/libaccess_output_dummy_plugin.la
+lib/vlc/plugins/access_output/libaccess_output_file_plugin.la
+lib/vlc/plugins/access_output/libaccess_output_http_plugin.la
+lib/vlc/plugins/access_output/libaccess_output_udp_plugin.la
+lib/vlc/plugins/audio_filter/liba52tofloat32_plugin.la
+lib/vlc/plugins/audio_filter/liba52tospdif_plugin.la
+lib/vlc/plugins/audio_filter/libaudio_format_plugin.la
+lib/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.la
+lib/vlc/plugins/audio_filter/libbandlimited_resampler_plugin.la
+lib/vlc/plugins/audio_filter/libchorus_flanger_plugin.la
+lib/vlc/plugins/audio_filter/libconverter_fixed_plugin.la
+lib/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.la
+lib/vlc/plugins/audio_filter/libdtstofloat32_plugin.la
+lib/vlc/plugins/audio_filter/libdtstospdif_plugin.la
+lib/vlc/plugins/audio_filter/libequalizer_plugin.la
+lib/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.la
+lib/vlc/plugins/audio_filter/libmono_plugin.la
+lib/vlc/plugins/audio_filter/libmpgatofixed32_plugin.la
+lib/vlc/plugins/audio_filter/libnormvol_plugin.la
+lib/vlc/plugins/audio_filter/libparam_eq_plugin.la
+lib/vlc/plugins/audio_filter/libscaletempo_plugin.la
+lib/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.la
+lib/vlc/plugins/audio_filter/libspatializer_plugin.la
+lib/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.la
+lib/vlc/plugins/audio_filter/libugly_resampler_plugin.la
+lib/vlc/plugins/audio_mixer/libfloat32_mixer_plugin.la
+lib/vlc/plugins/audio_mixer/libspdif_mixer_plugin.la
+lib/vlc/plugins/audio_mixer/libtrivial_mixer_plugin.la
+lib/vlc/plugins/audio_output/libaout_file_plugin.la
+lib/vlc/plugins/audio_output/liboss_plugin.la
+${PLIST.pulseaudio}lib/vlc/plugins/audio_output/libpulse_plugin.la
+lib/vlc/plugins/codec/liba52_plugin.la
+lib/vlc/plugins/codec/libadpcm_plugin.la
+lib/vlc/plugins/codec/libaes3_plugin.la
+lib/vlc/plugins/codec/libaraw_plugin.la
+lib/vlc/plugins/codec/libavcodec_plugin.la
+lib/vlc/plugins/codec/libcc_plugin.la
+lib/vlc/plugins/codec/libcdg_plugin.la
+lib/vlc/plugins/codec/libcvdsub_plugin.la
+lib/vlc/plugins/codec/libdts_plugin.la
+lib/vlc/plugins/codec/libdvbsub_plugin.la
+lib/vlc/plugins/codec/libfake_plugin.la
+lib/vlc/plugins/codec/libflac_plugin.la
+lib/vlc/plugins/codec/libinvmem_plugin.la
+lib/vlc/plugins/codec/liblibmpeg2_plugin.la
+lib/vlc/plugins/codec/liblpcm_plugin.la
+lib/vlc/plugins/codec/libmpeg_audio_plugin.la
+lib/vlc/plugins/codec/libpng_plugin.la
+lib/vlc/plugins/codec/librawvideo_plugin.la
+lib/vlc/plugins/codec/libspudec_plugin.la
+lib/vlc/plugins/codec/libsubsdec_plugin.la
+lib/vlc/plugins/codec/libsubsusf_plugin.la
+lib/vlc/plugins/codec/libsvcdsub_plugin.la
+lib/vlc/plugins/codec/libt140_plugin.la
+lib/vlc/plugins/codec/libtelx_plugin.la
+lib/vlc/plugins/codec/libtheora_plugin.la
+lib/vlc/plugins/codec/libvorbis_plugin.la
+lib/vlc/plugins/codec/libx264_plugin.la
+lib/vlc/plugins/control/libgestures_plugin.la
+lib/vlc/plugins/control/libglobalhotkeys_plugin.la
+lib/vlc/plugins/control/libhotkeys_plugin.la
+lib/vlc/plugins/control/libmotion_plugin.la
+lib/vlc/plugins/control/libnetsync_plugin.la
+lib/vlc/plugins/control/liboldhttp_plugin.la
+lib/vlc/plugins/control/liboldrc_plugin.la
+lib/vlc/plugins/control/liboldtelnet_plugin.la
+lib/vlc/plugins/control/libsignals_plugin.la
+lib/vlc/plugins/demux/libaiff_plugin.la
+lib/vlc/plugins/demux/libasf_plugin.la
+lib/vlc/plugins/demux/libau_plugin.la
+lib/vlc/plugins/demux/libavformat_plugin.la
+lib/vlc/plugins/demux/libavi_plugin.la
+lib/vlc/plugins/demux/libdemux_cdg_plugin.la
+lib/vlc/plugins/demux/libdemuxdump_plugin.la
+lib/vlc/plugins/demux/libdirac_plugin.la
+lib/vlc/plugins/demux/libes_plugin.la
+lib/vlc/plugins/demux/libflacsys_plugin.la
+lib/vlc/plugins/demux/libh264_plugin.la
+lib/vlc/plugins/demux/liblive555_plugin.la
+lib/vlc/plugins/demux/libmjpeg_plugin.la
+lib/vlc/plugins/demux/libmkv_plugin.la
+lib/vlc/plugins/demux/libmp4_plugin.la
+lib/vlc/plugins/demux/libmpc_plugin.la
+lib/vlc/plugins/demux/libmpgv_plugin.la
+lib/vlc/plugins/demux/libnsc_plugin.la
+lib/vlc/plugins/demux/libnsv_plugin.la
+lib/vlc/plugins/demux/libnuv_plugin.la
+lib/vlc/plugins/demux/libogg_plugin.la
+lib/vlc/plugins/demux/libplaylist_plugin.la
+lib/vlc/plugins/demux/libps_plugin.la
+lib/vlc/plugins/demux/libpva_plugin.la
+lib/vlc/plugins/demux/librawaud_plugin.la
+lib/vlc/plugins/demux/librawdv_plugin.la
+lib/vlc/plugins/demux/librawvid_plugin.la
+lib/vlc/plugins/demux/libreal_plugin.la
+lib/vlc/plugins/demux/libsmf_plugin.la
+lib/vlc/plugins/demux/libsubtitle_plugin.la
+lib/vlc/plugins/demux/libts_plugin.la
+lib/vlc/plugins/demux/libtta_plugin.la
+lib/vlc/plugins/demux/libty_plugin.la
+lib/vlc/plugins/demux/libvc1_plugin.la
+lib/vlc/plugins/demux/libvobsub_plugin.la
+lib/vlc/plugins/demux/libvoc_plugin.la
+lib/vlc/plugins/demux/libwav_plugin.la
+lib/vlc/plugins/demux/libxa_plugin.la
+lib/vlc/plugins/gui/libqt4_plugin.la
+lib/vlc/plugins/meta_engine/libfolder_plugin.la
+lib/vlc/plugins/meta_engine/libtaglib_plugin.la
+lib/vlc/plugins/misc/libaudioscrobbler_plugin.la
+lib/vlc/plugins/misc/libdummy_plugin.la
+lib/vlc/plugins/misc/libexport_plugin.la
+lib/vlc/plugins/misc/libfreetype_plugin.la
+lib/vlc/plugins/misc/libgnutls_plugin.la
+lib/vlc/plugins/misc/liblogger_plugin.la
+lib/vlc/plugins/misc/libosd_parser_plugin.la
+lib/vlc/plugins/misc/libstats_plugin.la
+lib/vlc/plugins/misc/libvod_rtsp_plugin.la
+lib/vlc/plugins/misc/libxdg_screensaver_plugin.la
+lib/vlc/plugins/misc/libxml_plugin.la
+lib/vlc/plugins/misc/libxscreensaver_plugin.la
+lib/vlc/plugins/misc/libxtag_plugin.la
+lib/vlc/plugins/mmx/libi420_rgb_mmx_plugin.la
+lib/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.la
+lib/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.la
+lib/vlc/plugins/mmx/libmemcpymmx_plugin.la
+lib/vlc/plugins/mmxext/libmemcpymmxext_plugin.la
+lib/vlc/plugins/mux/libmux_asf_plugin.la
+lib/vlc/plugins/mux/libmux_avi_plugin.la
+lib/vlc/plugins/mux/libmux_dummy_plugin.la
+lib/vlc/plugins/mux/libmux_mp4_plugin.la
+lib/vlc/plugins/mux/libmux_mpjpeg_plugin.la
+lib/vlc/plugins/mux/libmux_ogg_plugin.la
+lib/vlc/plugins/mux/libmux_ps_plugin.la
+lib/vlc/plugins/mux/libmux_ts_plugin.la
+lib/vlc/plugins/mux/libmux_wav_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_copy_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_dirac_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_flac_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_h264_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_mlp_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.la
+lib/vlc/plugins/services_discovery/libmediadirs_plugin.la
+lib/vlc/plugins/services_discovery/libpodcast_plugin.la
+lib/vlc/plugins/services_discovery/libsap_plugin.la
+lib/vlc/plugins/services_discovery/libxcb_apps_plugin.la
+lib/vlc/plugins/sse2/libi420_rgb_sse2_plugin.la
+lib/vlc/plugins/sse2/libi420_yuy2_sse2_plugin.la
+lib/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.la
+lib/vlc/plugins/stream_filter/libdecomp_plugin.la
+lib/vlc/plugins/stream_filter/libstream_filter_rar_plugin.la
+lib/vlc/plugins/stream_filter/libstream_filter_record_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_autodel_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_bridge_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_description_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_display_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_dummy_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_duplicate_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_es_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_gather_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_raop_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_record_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_rtp_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_smem_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_standard_plugin.la
+lib/vlc/plugins/stream_out/libstream_out_transcode_plugin.la
+lib/vlc/plugins/video_chroma/libgrey_yuv_plugin.la
+lib/vlc/plugins/video_chroma/libi420_rgb_plugin.la
+lib/vlc/plugins/video_chroma/libi420_yuy2_plugin.la
+lib/vlc/plugins/video_chroma/libi422_i420_plugin.la
+lib/vlc/plugins/video_chroma/libi422_yuy2_plugin.la
+lib/vlc/plugins/video_chroma/libyuy2_i420_plugin.la
+lib/vlc/plugins/video_chroma/libyuy2_i422_plugin.la
+lib/vlc/plugins/video_filter/libadjust_plugin.la
+lib/vlc/plugins/video_filter/libalphamask_plugin.la
+lib/vlc/plugins/video_filter/libaudiobargraph_v_plugin.la
+lib/vlc/plugins/video_filter/libball_plugin.la
+lib/vlc/plugins/video_filter/libblend_plugin.la
+lib/vlc/plugins/video_filter/libblendbench_plugin.la
+lib/vlc/plugins/video_filter/libbluescreen_plugin.la
+lib/vlc/plugins/video_filter/libcanvas_plugin.la
+lib/vlc/plugins/video_filter/libchain_plugin.la
+lib/vlc/plugins/video_filter/libclone_plugin.la
+lib/vlc/plugins/video_filter/libcolorthres_plugin.la
+lib/vlc/plugins/video_filter/libcrop_plugin.la
+lib/vlc/plugins/video_filter/libcroppadd_plugin.la
+lib/vlc/plugins/video_filter/libdeinterlace_plugin.la
+lib/vlc/plugins/video_filter/libdynamicoverlay_plugin.la
+lib/vlc/plugins/video_filter/liberase_plugin.la
+lib/vlc/plugins/video_filter/libextract_plugin.la
+lib/vlc/plugins/video_filter/libgaussianblur_plugin.la
+lib/vlc/plugins/video_filter/libgradient_plugin.la
+lib/vlc/plugins/video_filter/libgrain_plugin.la
+lib/vlc/plugins/video_filter/libinvert_plugin.la
+lib/vlc/plugins/video_filter/liblogo_plugin.la
+lib/vlc/plugins/video_filter/libmagnify_plugin.la
+lib/vlc/plugins/video_filter/libmarq_plugin.la
+lib/vlc/plugins/video_filter/libmirror_plugin.la
+lib/vlc/plugins/video_filter/libmosaic_plugin.la
+lib/vlc/plugins/video_filter/libmotionblur_plugin.la
+lib/vlc/plugins/video_filter/libmotiondetect_plugin.la
+lib/vlc/plugins/video_filter/libnoise_plugin.la
+lib/vlc/plugins/video_filter/libosdmenu_plugin.la
+lib/vlc/plugins/video_filter/libpanoramix_plugin.la
+lib/vlc/plugins/video_filter/libpostproc_plugin.la
+lib/vlc/plugins/video_filter/libpsychedelic_plugin.la
+lib/vlc/plugins/video_filter/libpuzzle_plugin.la
+lib/vlc/plugins/video_filter/libremoteosd_plugin.la
+lib/vlc/plugins/video_filter/libripple_plugin.la
+lib/vlc/plugins/video_filter/librotate_plugin.la
+lib/vlc/plugins/video_filter/librss_plugin.la
+lib/vlc/plugins/video_filter/librv32_plugin.la
+lib/vlc/plugins/video_filter/libscale_plugin.la
+lib/vlc/plugins/video_filter/libscene_plugin.la
+lib/vlc/plugins/video_filter/libsharpen_plugin.la
+lib/vlc/plugins/video_filter/libswscale_plugin.la
+lib/vlc/plugins/video_filter/libtransform_plugin.la
+lib/vlc/plugins/video_filter/libvideo_filter_wrapper_plugin.la
+lib/vlc/plugins/video_filter/libwall_plugin.la
+lib/vlc/plugins/video_filter/libwave_plugin.la
+lib/vlc/plugins/video_filter/libyuvp_plugin.la
+lib/vlc/plugins/video_output/libsnapshot_plugin.la
+lib/vlc/plugins/video_output/libvmem_plugin.la
+lib/vlc/plugins/video_output/libvout_wrapper_plugin.la
+lib/vlc/plugins/video_output/libxcb_glx_plugin.la
+lib/vlc/plugins/video_output/libxcb_window_plugin.la
+lib/vlc/plugins/video_output/libxcb_x11_plugin.la
+lib/vlc/plugins/video_output/libxcb_xv_plugin.la
+lib/vlc/plugins/video_output/libyuv_plugin.la
+lib/vlc/plugins/visualization/libvisual_plugin.la
+lib/vlc/vlc-cache-gen
 man/man1/vlc-config.1
 man/man1/vlc-wrapper.1
 man/man1/vlc.1
 share/applications/vlc.desktop
 share/doc/vlc/bugreport-howto.txt
 share/doc/vlc/fortunes.txt
-share/doc/vlc/intf-cdda.txt
 share/doc/vlc/intf-vcd.txt
+share/icons/hicolor/128x128/apps/vlc-christmas.png
+share/icons/hicolor/128x128/apps/vlc.png
+share/icons/hicolor/16x16/apps/vlc.png
+share/icons/hicolor/16x16/apps/vlc.xpm
+share/icons/hicolor/256x256/apps/vlc.png
+share/icons/hicolor/32x32/apps/vlc-christmas.xpm
+share/icons/hicolor/32x32/apps/vlc.png
+share/icons/hicolor/32x32/apps/vlc.xpm
+share/icons/hicolor/48x48/apps/vlc-christmas.png
+share/icons/hicolor/48x48/apps/vlc.png
+share/kde4/apps/solid/actions/vlc-opencda.desktop
+share/kde4/apps/solid/actions/vlc-opendvd.desktop
+share/kde4/apps/solid/actions/vlc-openvcd.desktop
 share/locale/af/LC_MESSAGES/vlc.mo
 share/locale/ar/LC_MESSAGES/vlc.mo
+share/locale/ast/LC_MESSAGES/vlc.mo
+share/locale/be/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
@@ -369,11 +380,13 @@ share/locale/fa/LC_MESSAGES/vlc.mo
 share/locale/fi/LC_MESSAGES/vlc.mo
 share/locale/fr/LC_MESSAGES/vlc.mo
 share/locale/fur/LC_MESSAGES/vlc.mo
+share/locale/ga/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/hy/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
@@ -400,6 +413,7 @@ share/locale/pt_BR/LC_MESSAGES/vlc.mo
 share/locale/pt_PT/LC_MESSAGES/vlc.mo
 share/locale/ro/LC_MESSAGES/vlc.mo
 share/locale/ru/LC_MESSAGES/vlc.mo
+share/locale/si/LC_MESSAGES/vlc.mo
 share/locale/sk/LC_MESSAGES/vlc.mo
 share/locale/sl/LC_MESSAGES/vlc.mo
 share/locale/sq/LC_MESSAGES/vlc.mo
@@ -511,15 +525,7 @@ 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
-share/vlc/vlc16x16.xpm
-share/vlc/vlc32x32-christmas.xpm
-share/vlc/vlc32x32.png
-share/vlc/vlc32x32.xpm
-share/vlc/vlc48x48-christmas.png
-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
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index cb1bda2d895..6efe08933f5 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2011/01/13 13:36:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2011/01/24 18:54:04 drochner Exp $
 
 BUILDLINK_TREE+=	vlc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	vlc
 VLC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.vlc?=	vlc>=1.0.0
-BUILDLINK_ABI_DEPENDS.vlc?=	vlc>=1.0.6nb6
+BUILDLINK_ABI_DEPENDS.vlc?=	vlc>=1.0.6
 BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
 
 pkgbase:= vlc
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 833984846fc..ee6a3cfed48 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.38 2010/07/03 14:24:26 wiz Exp $
+$NetBSD: distinfo,v 1.39 2011/01/24 18:54:04 drochner 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) = 7e3939a647f04661a2eba4fdbb720637dd267334
-SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271
-SHA1 (patch-configure) = 44f3bc76668d9529ce35812d2c194199a0623a09
-SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407
+SHA1 (vlc-1.1.6.tar.bz2) = 4cb4014d116493cc7d1b09622d0458121c14ce73
+RMD160 (vlc-1.1.6.tar.bz2) = 537b264745ee8b9f803a6b62ea5d49b66e11d8b5
+Size (vlc-1.1.6.tar.bz2) = 24631857 bytes
+SHA1 (patch-aa) = 684f7ad6a20ed6b9b8a8be2fc61836e6b471b686
+SHA1 (patch-ab) = 7ed32dc2a2c092083dad3c902848ba44369eac38
+SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
+SHA1 (patch-ar) = 25d22167cef8b8fa2a07ef633de196726eb354d2
+SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
+SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
+SHA1 (patch-configure) = 83f476cc71d795a69f787713a04471e078c0ec52
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index e28887203ea..858d8778ed1 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.18 2010/11/04 12:35:10 wiz Exp $
+# $NetBSD: options.mk,v 1.19 2011/01/24 18:54:04 drochner Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		debug faad dbus hal skins sdl pulseaudio x11 gnome
-PKG_SUGGESTED_OPTIONS=		x11 pulseaudio
+PKG_SUGGESTED_OPTIONS=		x11
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa
index ebcd89edbab..3fd727d5542 100644
--- a/multimedia/vlc/patches/patch-aa
+++ b/multimedia/vlc/patches/patch-aa
@@ -1,30 +1,28 @@
-$NetBSD: patch-aa,v 1.13 2010/07/03 14:24:26 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2011/01/24 18:54:04 drochner Exp $
 
-http://trac.videolan.org/vlc/ticket/3762
-
---- modules/access/file.c.orig	2009-09-18 19:37:45 +0300
-+++ modules/access/file.c	2009-09-26 07:18:35 +0300
-@@ -50,6 +50,9 @@
- #if defined (__linux__)
+--- modules/access/file.c.orig	2010-07-19 01:21:06.000000000 +0900
++++ modules/access/file.c	2011-01-04 22:05:25.000000000 +0900
+@@ -52,6 +52,9 @@
+ #ifdef HAVE_LINUX_MAGIC_H
  #   include <sys/vfs.h>
  #   include <linux/magic.h>
 +#elif defined (HAVE_FSTATVFS)
 +#   include <sys/statvfs.h>
 +#   include <sys/mount.h>
- #elif defined (HAVE_SYS_MOUNT_H)
- #   include <sys/param.h>
- #   include <sys/mount.h>
-@@ -126,7 +129,12 @@ struct access_sys_t
+ #endif
  
+ #if defined( WIN32 )
+@@ -90,7 +93,12 @@
+ #ifndef WIN32
  static bool IsRemote (int fd)
  {
--#ifdef HAVE_FSTATFS
-+#if !defined(__linux__) && defined(HAVE_FSTATVFS)
+-#if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL)
++#if !defined(__linux__) && defined(HAVE_FSTATVFS) && defined (MNT_LOCAL)
 +    struct statvfs s;
 +    if (fstatvfs(fd, &s))
 +        return false;  
 +    return !(s.f_flag & MNT_LOCAL);
 +#elif defined (HAVE_FSTATFS)
-     struct statfs stf;
+     struct statvfs stf;
  
-     if (fstatfs (fd, &stf))
+     if (fstatvfs (fd, &stf))
diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
index b9a7e845f73..52e5502690b 100644
--- a/multimedia/vlc/patches/patch-ab
+++ b/multimedia/vlc/patches/patch-ab
@@ -1,24 +1,35 @@
-$NetBSD: patch-ab,v 1.6 2010/06/20 15:58:06 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2011/01/24 18:54:04 drochner Exp $
 
-Fixed in git version ffa6a2fa83452afe6a6ec67c4a3e8a5f1a6aaeef.
-
---- modules/codec/png.c.orig	2010-03-07 18:38:01.000000000 +0000
-+++ modules/codec/png.c
-@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t
-     p_info = png_create_info_struct( p_png );
-     if( p_info == NULL )
-     {
--        png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
-+        png_destroy_read_struct( &p_png, NULL, NULL );
-         block_Release( p_block ); *pp_block = NULL;
-         return NULL;
-     }
-@@ -163,7 +163,7 @@ static picture_t *DecodeBlock( decoder_t
-     p_end_info = png_create_info_struct( p_png );
-     if( p_end_info == NULL )
-     {
--        png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
-+        png_destroy_read_struct( &p_png, &p_info, NULL );
-         block_Release( p_block ); *pp_block = NULL;
-         return NULL;
-     }
+--- configure.ac.orig	2010-11-12 07:49:28.000000000 +0900
++++ configure.ac	2011-01-04 22:47:39.000000000 +0900
+@@ -2688,13 +2688,13 @@
+            AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+            echo "VAAPI acceleration activated"
+         ],[
+-	AS_IF([test "${enable_libva}" == "yes"],
++	AS_IF([test "${enable_libva}" = "yes"],
+ 	      [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
+               [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
+         ])
+         VLC_RESTORE_FLAGS
+       ],[
+-	AS_IF([test "${enable_libva}" == "yes"],
++	AS_IF([test "${enable_libva}" = "yes"],
+               [AC_MSG_ERROR([Could not find required libva.])],
+               [AC_MSG_WARN([libva not found  ])])
+       ])
+@@ -2721,12 +2721,12 @@
+            AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.])
+            echo "DxVA2 acceleration activated"
+         ],[
+-	AS_IF([test "${enable_dxva2}" == "yes"],
++	AS_IF([test "${enable_dxva2}" = "yes"],
+ 	      [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
+               [AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
+         ])
+       ],[
+-	AS_IF([test "${enable_dxva2}" == "yes"],
++	AS_IF([test "${enable_dxva2}" = "yes"],
+               [AC_MSG_ERROR([Could not find required dxva2api.h])],
+               [AC_MSG_WARN([dxva2api.h not found])])
+       ])
diff --git a/multimedia/vlc/patches/patch-ap b/multimedia/vlc/patches/patch-ap
new file mode 100644
index 00000000000..d4ef19d3ff5
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2011/01/24 18:54:04 drochner Exp $
+
+--- bin/override.c.orig	2010-08-09 05:29:21.000000000 +0900
++++ bin/override.c	2011-01-05 00:30:10.000000000 +0900
+@@ -120,7 +120,7 @@
+  *
+  * Some evil libraries modify the environment. We currently ignore the calls as
+  * they could crash the process. This may cause funny behaviour though. */
+-int putenv (char *str)
++int putenv (const char *str)
+ {
+     if (override)
+     {
diff --git a/multimedia/vlc/patches/patch-ar b/multimedia/vlc/patches/patch-ar
new file mode 100644
index 00000000000..52012658754
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ar
@@ -0,0 +1,34 @@
+$NetBSD: patch-ar,v 1.1 2011/01/24 18:54:04 drochner Exp $
+
+--- modules/misc/inhibit/xdg.c.orig	2010-11-26 22:32:46.000000000 +0000
++++ modules/misc/inhibit/xdg.c
+@@ -26,7 +26,11 @@
+ #include <vlc_plugin.h>
+ #include <vlc_inhibit.h>
+ #include <assert.h>
++#ifdef _POSIX_SPAWN
++# if (_POSIX_SPAWN >= 0)
+ #include <spawn.h>
++# endif
++#endif
+ #include <sys/wait.h>
+ 
+ static int Open (vlc_object_t *);
+@@ -137,6 +141,8 @@ static void *Thread (void *data)
+         pid_t pid;
+ 
+         vlc_mutex_unlock (&p_sys->lock);
++#ifdef _POSIX_SPAWN
++# if (_POSIX_SPAWN >= 0)
+         if (!posix_spawnp (&pid, "xdg-screensaver", NULL, NULL, argv, environ))
+         {
+             int status;
+@@ -146,6 +152,8 @@ static void *Thread (void *data)
+             while (waitpid (pid, &status, 0) == -1);
+         }
+         else/* We don't handle the error, but busy looping would be worse :( */
++# endif
++#endif
+             msg_Warn (ih, "could not start xdg-screensaver");
+ 
+         vlc_mutex_lock (&p_sys->lock);
diff --git a/multimedia/vlc/patches/patch-as b/multimedia/vlc/patches/patch-as
new file mode 100644
index 00000000000..d5c7feb56f1
--- /dev/null
+++ b/multimedia/vlc/patches/patch-as
@@ -0,0 +1,110 @@
+$NetBSD: patch-as,v 1.1 2011/01/24 18:54:04 drochner Exp $
+
+--- modules/misc/inhibit/xscreensaver.c~	2010-04-13 09:22:27.000000000 +0900
++++ modules/misc/inhibit/xscreensaver.c	2011-01-08 23:03:09.000000000 +0900
+@@ -39,7 +39,9 @@
+ #include <sys/wait.h>
+ #include <fcntl.h>
+ #include <signal.h>
++#ifdef _POSIX_SPAWN 
+ #include <spawn.h>
++#endif
+ 
+ /*****************************************************************************
+  * Local prototypes
+@@ -53,12 +55,16 @@
+ struct vlc_inhibit_sys
+ {
+     vlc_timer_t timer;
++#ifdef _POSIX_SPAWN
+     posix_spawn_file_actions_t actions;
+     posix_spawnattr_t attr;
+     int nullfd;
++#endif
+ };
+ 
++#ifdef _POSIX_SPAWN 
+ extern char **environ;
++#endif
+ 
+ /*****************************************************************************
+  * Module descriptor
+@@ -88,6 +94,7 @@
+     }
+     p_ih->inhibit = Inhibit;
+ 
++#ifdef _POSIX_SPAWN 
+     int fd = vlc_open ("/dev/null", O_WRONLY);
+     posix_spawn_file_actions_init (&p_sys->actions);
+     if (fd != -1)
+@@ -103,6 +110,7 @@
+     sigemptyset (&set);
+     posix_spawnattr_setsigmask (&p_sys->attr, &set);
+    
++#endif
+     return VLC_SUCCESS;
+ }
+ 
+@@ -115,10 +123,12 @@
+     vlc_inhibit_sys_t *p_sys = p_ih->p_sys;
+ 
+     vlc_timer_destroy( p_sys->timer );
++#ifdef _POSIX_SPAWN
+     if (p_sys->nullfd != -1)
+         close (p_sys->nullfd);
+     posix_spawnattr_destroy (&p_sys->attr);
+     posix_spawn_file_actions_destroy (&p_sys->actions);
++#endif
+     free( p_sys );
+ }
+ 
+@@ -131,15 +141,49 @@
+ /*****************************************************************************
+  * Execute: Spawns a process using execv()
+  *****************************************************************************/
++#ifdef _POSIX_SPAWN 
+ static void Execute (vlc_inhibit_t *p_ih, const char *const *argv)
++# else
++static void Execute (vlc_inhibit_t *p_ih, const char *const *ppsz_args)
++#endif
+ {
++#ifdef _POSIX_SPAWN
+     vlc_inhibit_sys_t *p_sys = p_ih->p_sys;
+     pid_t pid;
+ 
+     if (posix_spawnp (&pid, argv[0], &p_sys->actions, &p_sys->attr,
+                       (char **)argv, environ) == 0)
++#else
++      pid_t pid = fork();
++      switch ( pid )
++#endif
+     {
++#ifdef _POSIX_SPAWN
+         while (waitpid (pid, NULL, 0) != pid);
++#else
++        case 0:     /* we're the child */
++        {
++            sigset_t set;
++            sigemptyset (&set);
++            pthread_sigmask (SIG_SETMASK, &set, NULL);
++
++            /* We don't want output */
++            if( ( freopen( "/dev/null", "w", stdout ) != NULL )
++             && ( freopen( "/dev/null", "w", stderr ) != NULL ) )
++                execv( ppsz_args[0] , (char *const *)ppsz_args );
++            /* If the file we want to execute doesn't exist we exit() */
++            exit( EXIT_FAILURE );
++        }
++        case -1:    /* we're the error */
++            msg_Dbg( p_ih, "Couldn't fork() while launching %s",
++                     ppsz_args[0] );
++            break;
++        default:    /* we're the parent */
++            /* Wait for the child to exit.
++             * We will not deadlock because we ran "/bin/sh &" */
++            while( waitpid( pid, NULL, 0 ) != pid);
++            break;
++#endif
+     }
+ }
+ 
diff --git a/multimedia/vlc/patches/patch-at b/multimedia/vlc/patches/patch-at
new file mode 100644
index 00000000000..938da885547
--- /dev/null
+++ b/multimedia/vlc/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2011/01/24 18:54:04 drochner Exp $
+
+--- bin/override.c.orig	2011-01-24 11:11:26.000000000 +0000
++++ bin/override.c
+@@ -27,7 +27,7 @@
+ 
+ void vlc_enable_override (void);
+ 
+-#if defined (__GNUC__) /* typeof and statement-expression */ \
++#if 0 && defined (__GNUC__) /* typeof and statement-expression */ \
+  && (defined (__ELF__) && !defined (__sun__))
+ /* Solaris crashes on printf("%s", NULL); which is legal, but annoying. */
+ 
diff --git a/multimedia/vlc/patches/patch-configure b/multimedia/vlc/patches/patch-configure
index 2ee84c6e783..adf3093a75e 100644
--- a/multimedia/vlc/patches/patch-configure
+++ b/multimedia/vlc/patches/patch-configure
@@ -1,25 +1,49 @@
-$NetBSD: patch-configure,v 1.5 2010/06/20 15:58:06 wiz Exp $
+$NetBSD: patch-configure,v 1.6 2011/01/24 18:54:04 drochner Exp $
 
-First chunk: http://trac.videolan.org/vlc/ticket/3762
-Second chunk: http://trac.videolan.org/vlc/ticket/3761
-
---- configure.ac.orig	2009-09-19 21:30:21.000000000 +0200
-+++ configure.ac
-@@ -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}"
--  AC_CHECK_HEADERS(linux/videodev2.h, [
-+  AC_CHECK_HEADERS(linux/videodev2.h sys/videoio.h, [
-     VLC_ADD_PLUGIN([v4l2])
-   ],[])
-   CPPFLAGS="${CPPFLAGS_save}"
+--- configure.orig	2010-11-12 08:01:11.000000000 +0900
++++ configure	2011-01-04 22:57:48.000000000 +0900
+@@ -32744,7 +32744,7 @@
+ 	echo "$LIBVA_PKG_ERRORS" >&5
+ 
+ 
+-	if test "${enable_libva}" == "yes"; then :
++	if test "${enable_libva}" = "yes"; then :
+   as_fn_error $? "Could not find required libva." "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva not found  " >&5
+@@ -32755,7 +32755,7 @@
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+-	if test "${enable_libva}" == "yes"; then :
++	if test "${enable_libva}" = "yes"; then :
+   as_fn_error $? "Could not find required libva." "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva not found  " >&5
+@@ -32805,7 +32805,7 @@
+ 
+ else
+ 
+-	if test "${enable_libva}" == "yes"; then :
++	if test "${enable_libva}" = "yes"; then :
+   as_fn_error $? "libva is present but libavcodec/vaapi.h is missing" "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva is present but libavcodec/vaapi.h is missing " >&5
+@@ -32879,7 +32879,7 @@
+ 
+ else
+ 
+-	if test "${enable_dxva2}" == "yes"; then :
++	if test "${enable_dxva2}" = "yes"; then :
+   as_fn_error $? "dxva2 is present but libavcodec/dxva2.h is missing" "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2 is present but libavcodec/dxva2.h is missing " >&5
+@@ -32893,7 +32893,7 @@
+ 
+ else
+ 
+-	if test "${enable_dxva2}" == "yes"; then :
++	if test "${enable_dxva2}" = "yes"; then :
+   as_fn_error $? "Could not find required dxva2api.h" "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2api.h not found" >&5
diff --git a/multimedia/vlc/patches/patch-v4l2 b/multimedia/vlc/patches/patch-v4l2
deleted file mode 100644
index 9aae2acd958..00000000000
--- a/multimedia/vlc/patches/patch-v4l2
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-v4l2,v 1.3 2010/06/20 15:58:06 wiz Exp $
-
-http://trac.videolan.org/vlc/ticket/3761
-
---- 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>
- 
--#include <linux/videodev2.h>
-+#if defined(HAVE_LINUX_VIDEODEV2_H)
-+#   include <linux/videodev2.h>
-+#elif defined(HAVE_SYS_VIDEOIO_H)
-+#   include <sys/videoio.h>
-+#else
-+#   error "No Video4Linux2 headers found."
-+#endif
- 
- #include <poll.h>
-