Update vlc package to 1.1.8.

pkgsrc change and notes:

* Update PLIST to reflect PKG_OPTION setting.
* With pulseaudio and sdl PKG_OPTION, I couldn't build the package because
  of vlc-cache-gen core dump.
* x11 PKG_OPTION could be elminated since the package won't build without it.

Changes between 1.1.7 and 1.1.8:
--------------------------------

Mac OS X Interface:
 * New UI graphics by Damien Erambert

Interfaces:
 * Oldrc interface is again the default RC interface, on Windows
 * Luarc, luahttp and luatelnet fixes
 * Qt and Mac OS X fixes
 * numerous Skins2 fixes, notably winamp2 skins

Encoder:
 * new libschroedinger-based Dirac codec encoder, faster than the current one

Access/Demuxers/Codecs:
 * Subtitles auto-detection is back for .txt files
 * vod/rtsp server and rtsp input fixes
 * mp4 demuxer improvements
 * ogg, rstp input, video filters minor fixes
 * taglib's replaygain is fixed for mp3
 * vobsub support has an improved auto-detection
 * fix a crash in malformed ape files

Miscellaneous fixes in:
 * Pulseaudio audio output, notably for usb cards
 * Stacktraces are now limited in size on Windows
 * Video resolution is now limited to 8192x8192, for security reasons
   See CORE-2011-0208
 * Configure and build system improvements
 * DirectShow and BDA build headers have been updated

Translations:
 * Update for Finnish, Galician, Dutch, Chinese, German, Japanese, Lithuanian,
   Slovak, French, Polish, Estonian, Brazillian Portuguese and Hebrew
 * New icelandic translation

6 files changed, 28 insertions, 51 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 68d296d46e0..2157515f010 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.108 2011/03/01 11:18:34 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2011/04/02 16:20:37 taca Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
 CATEGORIES=		multimedia
-MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
+			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		1.1.7
+VLC_VERSION=		1.1.8
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
@@ -80,7 +81,7 @@ INSTALLATION_DIRS+=	share/vlc/http/dialogs share/vlc/http/images \
 			share/vlc/osdmenu/dvd/volume \
 			share/vlc/osdmenu/dvd/unselect \
 			share/vlc/osdmenu/dvd/selection \
-			share/vlc/skins2 share/vlc/skins2/fonts \
+			share/vlc/skins2/fonts \
 			${PKGMANDIR}/man1
 pre-configure:
 	cd ${WRKSRC} && autoreconf -f
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 48037c416e6..d3b3db2780a 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.39 2011/02/12 10:53:02 tnn Exp $
+@comment $NetBSD: PLIST,v 1.40 2011/04/02 16:20:37 taca Exp $
 bin/cvlc
 bin/qvlc
 bin/rvlc
+${PLIST.skins}bin/svlc
 bin/vlc
 bin/vlc-wrapper
 include/vlc/deprecated.h
@@ -92,6 +93,7 @@ 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
+${PLIST.gnome}lib/vlc/plugins/access/libaccess_gnomevfs_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
@@ -113,7 +115,6 @@ 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
@@ -164,6 +165,7 @@ 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
+${PLIST.dbus}lib/vlc/plugins/control/libdbus_plugin.la
 lib/vlc/plugins/control/libgestures_plugin.la
 lib/vlc/plugins/control/libglobalhotkeys_plugin.la
 lib/vlc/plugins/control/libhotkeys_plugin.la
@@ -212,6 +214,7 @@ 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
+${PLIST.skins}lib/vlc/plugins/gui/libskins2_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
@@ -219,9 +222,12 @@ 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
+${PLIST.dbus}lib/vlc/plugins/misc/libinhibit_plugin.la
 lib/vlc/plugins/misc/liblogger_plugin.la
+${PLIST.dbus}lib/vlc/plugins/misc/libnotify_plugin.la
 lib/vlc/plugins/misc/libosd_parser_plugin.la
 lib/vlc/plugins/misc/libstats_plugin.la
+${PLIST.dbus}lib/vlc/plugins/misc/libtelepathy_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
@@ -366,6 +372,7 @@ 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/br/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
@@ -389,6 +396,7 @@ 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/is/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
@@ -522,6 +530,12 @@ 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
+${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
 share/vlc/utils/audio-vlc-default.sh
 share/vlc/utils/gnome-vlc-default.sh
 share/vlc/utils/video-vlc-default.sh
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 8d8bedfb4b3..7bba3940579 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.42 2011/02/14 19:03:18 drochner Exp $
+$NetBSD: distinfo,v 1.43 2011/04/02 16:20:38 taca Exp $
 
-SHA1 (vlc-1.1.7.tar.bz2) = 6bd559fe2bba51c5ed1ae71d18dc8ac611e72a04
-RMD160 (vlc-1.1.7.tar.bz2) = 1662f458c5e1cec41e27fa1320af817551577def
-Size (vlc-1.1.7.tar.bz2) = 24635812 bytes
+SHA1 (vlc-1.1.8.tar.bz2) = c4ac61e31fa287a0cb7744534a1abf49cf033776
+RMD160 (vlc-1.1.8.tar.bz2) = 728085c222f0a3c831d28f149898cc77f6cbe3a2
+Size (vlc-1.1.8.tar.bz2) = 25212756 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-au) = 7318b1d40246d5540a67c22565ebd439d5fe069d
-SHA1 (patch-av) = 2d876c99a4bfe2cd964a78fe19dd108d1cb5f550
 SHA1 (patch-configure) = 83f476cc71d795a69f787713a04471e078c0ec52
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index 858d8778ed1..4aa74376cbe 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2011/01/24 18:54:04 drochner Exp $
+# $NetBSD: options.mk,v 1.20 2011/04/02 16:20:38 taca Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		debug faad dbus hal skins sdl pulseaudio x11 gnome
@@ -46,6 +46,7 @@ CONFIGURE_ARGS+=	--disable-gnomevfs
 .if !empty(PKG_OPTIONS:Mdbus)
 CONFIGURE_ARGS+=	--enable-dbus
 .include "../../sysutils/dbus/buildlink3.mk"
+PLIST.dbus=		yes
 CONFIGURE_ARGS+=	--enable-notify
 .include "../../sysutils/libnotify/buildlink3.mk"
 
@@ -87,6 +88,7 @@ CONFIGURE_ARGS+=	--enable-release
 .if !empty(PKG_OPTIONS:Mskins)
 CONFIGURE_ARGS+=	--enable-skins2
 PLIST.skins=		yes
+INSTALLATION_DIRS+=	share/vlc/skins2
 .else
 CONFIGURE_ARGS+=	--disable-skins2
 .endif
diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-au
deleted file mode 100644
index 5cf5506ebfe..00000000000
--- a/multimedia/vlc/patches/patch-au
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-au,v 1.3 2011/02/14 19:03:19 drochner Exp $
-
-fix build with libmatroska-1.1
-
---- modules/demux/mkv/mkv.hpp.orig	2011-01-30 14:45:14.000000000 +0000
-+++ modules/demux/mkv/mkv.hpp
-@@ -92,7 +92,8 @@
- #include "matroska/KaxSegment.h"
- #include "matroska/KaxTag.h"
- #include "matroska/KaxTags.h"
--#include "matroska/KaxTagMulti.h"
-+//missing in libmatroska-1.1
-+//#include "matroska/KaxTagMulti.h"
- #include "matroska/KaxTracks.h"
- #include "matroska/KaxTrackAudio.h"
- #include "matroska/KaxTrackVideo.h"
diff --git a/multimedia/vlc/patches/patch-av b/multimedia/vlc/patches/patch-av
deleted file mode 100644
index ad6d43688e3..00000000000
--- a/multimedia/vlc/patches/patch-av
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-av,v 1.1 2011/02/14 19:03:19 drochner Exp $
-
-fix build with libmatroska-1.1
-
---- modules/demux/mkv/matroska_segment.cpp.orig	2010-09-27 14:38:23.000000000 +0000
-+++ modules/demux/mkv/matroska_segment.cpp
-@@ -220,6 +220,7 @@ void matroska_segment_c::LoadTags( KaxTa
-                     }
-                     ep->Up();
-                 }
-+#if 0 //not valid anymore
-                 else if( MKV_IS_ID( el, KaxTagGeneral ) )
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + General" );
-@@ -288,6 +289,7 @@ void matroska_segment_c::LoadTags( KaxTa
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + Multi Title" );
-                 }
-+#endif
-                 else
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + LoadTag Unknown (%s)", typeid( *el ).name() );