update to 2.0.6

changes:
Support for Matroska v4 files
Fix WMV, Ogg, AVI, MP4 and subtitles crashes and issues
Numerous translations updates and new Welsh translation
Fix some HTTPS certificate rejection
Fix ALAC decoding
Fix FLAC 6.1 and 7.1 channel order
Fix the vimeo parser
Numerous D-Bus and MPRIS2 improvements

6 files changed, 11 insertions, 196 deletions

diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index a505ff5f99b..a01786775da 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.26 2013/03/18 09:18:16 sbd Exp $
+# $NetBSD: Makefile,v 1.27 2013/04/12 13:40:47 drochner Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		4
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.xz
 
-VLC_VERSION=		2.0.5
+VLC_VERSION=		2.0.6
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
diff --git a/multimedia/vlc2/PLIST b/multimedia/vlc2/PLIST
index fad84a54161..4163f2fb6e4 100644
--- a/multimedia/vlc2/PLIST
+++ b/multimedia/vlc2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2013/03/18 09:18:16 sbd Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/04/12 13:40:47 drochner Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -53,6 +53,7 @@ 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_keys.h
 include/vlc/plugins/vlc_main.h
 include/vlc/plugins/vlc_md5.h
 include/vlc/plugins/vlc_media_library.h
@@ -407,6 +408,7 @@ share/kde/apps/solid/actions/vlc-openvcd.desktop
 share/locale/ach/LC_MESSAGES/vlc.mo
 share/locale/af/LC_MESSAGES/vlc.mo
 share/locale/am/LC_MESSAGES/vlc.mo
+share/locale/an/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
@@ -451,7 +453,6 @@ share/locale/kk/LC_MESSAGES/vlc.mo
 share/locale/km/LC_MESSAGES/vlc.mo
 share/locale/kmr/LC_MESSAGES/vlc.mo
 share/locale/ko/LC_MESSAGES/vlc.mo
-share/locale/ku/LC_MESSAGES/vlc.mo
 share/locale/lg/LC_MESSAGES/vlc.mo
 share/locale/lt/LC_MESSAGES/vlc.mo
 share/locale/lv/LC_MESSAGES/vlc.mo
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo
index 6c92b3b33a7..d06eebeacee 100644
--- a/multimedia/vlc2/distinfo
+++ b/multimedia/vlc2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.14 2013/01/30 15:52:18 drochner Exp $
+$NetBSD: distinfo,v 1.15 2013/04/12 13:40:47 drochner Exp $
 
-SHA1 (vlc-2.0.5.tar.xz) = 31bd518f4edd03ea394305176e5df3478e251cc0
-RMD160 (vlc-2.0.5.tar.xz) = 7956c1abb34fda73533019c67010faba9efcbf7e
-Size (vlc-2.0.5.tar.xz) = 18369292 bytes
-SHA1 (patch-SA1302) = 8604b68d587454ae5c18416b993241f511e8d1d5
+SHA1 (vlc-2.0.6.tar.xz) = 2ce21c949275702452bb1327febf6e98748a7972
+RMD160 (vlc-2.0.6.tar.xz) = 836d07c84da5980e321dce5c3f45b5b1b4814d84
+Size (vlc-2.0.6.tar.xz) = 18619836 bytes
 SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87
 SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905
 SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270
@@ -19,7 +18,6 @@ SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
 SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b
 SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6
 SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23
-SHA1 (patch-configure.ac) = 3a2cf801429a085b17384c2f4ac17e72cd925f34
 SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a
 SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3
 SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
diff --git a/multimedia/vlc2/options.mk b/multimedia/vlc2/options.mk
index 2697faaf12a..995def1c4e8 100644
--- a/multimedia/vlc2/options.mk
+++ b/multimedia/vlc2/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2012/07/24 18:40:42 drochner Exp $
+# $NetBSD: options.mk,v 1.4 2013/04/12 13:40:47 drochner Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS=		debug faad hal skins sdl pulseaudio x11
+PKG_SUPPORTED_OPTIONS=		debug faad skins sdl pulseaudio x11
 PKG_SUPPORTED_OPTIONS+=		gnome dts rtsp
 # XXX broken
 #PKG_SUPPORTED_OPTIONS+=	dbus
@@ -65,17 +65,8 @@ CONFIGURE_ARGS+=	--disable-telepathy
 
 PLIST.dbus=		yes
 
-## HAL support (requires dbus)
-.if !empty(PKG_OPTIONS:Mhal)
-CONFIGURE_ARGS+=	--enable-hal
-.include "../../sysutils/hal/buildlink3.mk"
-PLIST.hal=		yes
-.else
-CONFIGURE_ARGS+=	--disable-hal
-.endif
 .else
 CONFIGURE_ARGS+=	--disable-dbus
-CONFIGURE_ARGS+=	--disable-hal
 CONFIGURE_ARGS+=	--disable-notify
 .endif
 
diff --git a/multimedia/vlc2/patches/patch-SA1302 b/multimedia/vlc2/patches/patch-SA1302
deleted file mode 100644
index d622a6b229e..00000000000
--- a/multimedia/vlc2/patches/patch-SA1302
+++ /dev/null
@@ -1,159 +0,0 @@
-$NetBSD: patch-SA1302,v 1.1 2013/01/30 15:52:19 drochner Exp $
-
-upstream commit 330ba2296cd6841d0e8f0be40ef84966d5540fd3
-
---- modules/demux/asf/asf.c.orig	2012-08-28 17:25:19.000000000 +0000
-+++ modules/demux/asf/asf.c
-@@ -383,15 +383,30 @@ static mtime_t GetMoviePTS( demux_sys_t 
-     return i_time;
- }
- 
--#define GETVALUE2b( bits, var, def ) \
--    switch( (bits)&0x03 ) \
--    { \
--        case 1: var = p_peek[i_skip]; i_skip++; break; \
--        case 2: var = GetWLE( p_peek + i_skip );  i_skip+= 2; break; \
--        case 3: var = GetDWLE( p_peek + i_skip ); i_skip+= 4; break; \
--        case 0: \
--        default: var = def; break;\
-+static inline int GetValue2b(int *var, const uint8_t *p, int *skip, int left, int bits)
-+{
-+    switch(bits&0x03)
-+    {
-+    case 1:
-+        if (left < 1)
-+            return -1;
-+        *var = p[*skip]; *skip += 1;
-+        return 0;
-+    case 2:
-+        if (left < 2)
-+            return -1;
-+        *var = GetWLE(&p[*skip]); *skip += 2;
-+        return 0;
-+    case 3:
-+        if (left < 4)
-+            return -1;
-+        *var = GetDWLE(&p[*skip]); *skip += 4;
-+        return 0;
-+    case 0:
-+    default:
-+        return 0;
-     }
-+}
- 
- static int DemuxPacket( demux_t *p_demux )
- {
-@@ -405,15 +420,15 @@ static int DemuxPacket( demux_t *p_demux
-     int         i_packet_property;
- 
-     int         b_packet_multiple_payload;
--    int         i_packet_length;
--    int         i_packet_sequence;
--    int         i_packet_padding_length;
-+    int         i_packet_length = i_data_packet_min;
-+    int         i_packet_sequence = 0;
-+    int         i_packet_padding_length = 0;
- 
-     uint32_t    i_packet_send_time;
--    uint16_t    i_packet_duration;
-     int         i_payload;
-     int         i_payload_count;
-     int         i_payload_length_type;
-+    int         peek_size;
- 
- 
-     if( stream_Peek( p_demux->s, &p_peek,i_data_packet_min)<i_data_packet_min )
-@@ -421,6 +436,7 @@ static int DemuxPacket( demux_t *p_demux
-         msg_Warn( p_demux, "cannot peek while getting new packet, EOF ?" );
-         return 0;
-     }
-+    peek_size = i_data_packet_min;
-     i_skip = 0;
- 
-     /* *** parse error correction if present *** */
-@@ -461,9 +477,12 @@ static int DemuxPacket( demux_t *p_demux
-     b_packet_multiple_payload = i_packet_flags&0x01;
- 
-     /* read some value */
--    GETVALUE2b( i_packet_flags >> 5, i_packet_length, i_data_packet_min );
--    GETVALUE2b( i_packet_flags >> 1, i_packet_sequence, 0 );
--    GETVALUE2b( i_packet_flags >> 3, i_packet_padding_length, 0 );
-+    if (GetValue2b(&i_packet_length, p_peek, &i_skip, peek_size - i_skip, i_packet_flags >> 5) < 0)
-+        goto loop_error_recovery;
-+    if (GetValue2b(&i_packet_sequence, p_peek, &i_skip, peek_size - i_skip, i_packet_flags >> 1) < 0)
-+        goto loop_error_recovery;
-+    if (GetValue2b(&i_packet_padding_length, p_peek, &i_skip, peek_size - i_skip, i_packet_flags >> 3) < 0)
-+        goto loop_error_recovery;
- 
-     if( i_packet_padding_length > i_packet_length )
-     {
-@@ -479,7 +498,7 @@ static int DemuxPacket( demux_t *p_demux
-     }
- 
-     i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4;
--    i_packet_duration  = GetWLE( p_peek + i_skip ); i_skip += 2;
-+    /* uint16_t i_packet_duration = GetWLE( p_peek + i_skip ); */ i_skip += 2;
- 
-     i_packet_size_left = i_packet_length;
- 
-@@ -501,13 +520,13 @@ static int DemuxPacket( demux_t *p_demux
- 
-         int i_packet_keyframe;
-         unsigned int i_stream_number;
--        int i_media_object_number;
-+        int i_media_object_number = 0;
-         int i_media_object_offset;
--        int i_replicated_data_length;
--        int i_payload_data_length;
-+        int i_replicated_data_length = 0;
-+        int i_payload_data_length = 0;
-         int i_payload_data_pos;
-         int i_sub_payload_data_length;
--        int i_tmp;
-+        int i_tmp = 0;
- 
-         mtime_t i_pts;
-         mtime_t i_pts_delta;
-@@ -521,9 +540,12 @@ static int DemuxPacket( demux_t *p_demux
-         i_packet_keyframe = p_peek[i_skip] >> 7;
-         i_stream_number = p_peek[i_skip++] & 0x7f;
- 
--        GETVALUE2b( i_packet_property >> 4, i_media_object_number, 0 );
--        GETVALUE2b( i_packet_property >> 2, i_tmp, 0 );
--        GETVALUE2b( i_packet_property, i_replicated_data_length, 0 );
-+        if (GetValue2b(&i_media_object_number, p_peek, &i_skip, peek_size - i_skip, i_packet_property >> 4) < 0)
-+            break;
-+        if (GetValue2b(&i_tmp, p_peek, &i_skip, peek_size - i_skip, i_packet_property >> 2) < 0)
-+            break;
-+        if (GetValue2b(&i_replicated_data_length, p_peek, &i_skip, peek_size - i_skip, i_packet_property) < 0)
-+            break;
- 
-         if( i_replicated_data_length > 1 ) // should be at least 8 bytes
-         {
-@@ -558,7 +580,9 @@ static int DemuxPacket( demux_t *p_demux
-         i_pts = __MAX( i_pts - p_sys->p_fp->i_preroll * 1000, 0 );
-         if( b_packet_multiple_payload )
-         {
--            GETVALUE2b( i_payload_length_type, i_payload_data_length, 0 );
-+            i_payload_data_length = 0;
-+            if (GetValue2b(&i_payload_data_length, p_peek, &i_skip, peek_size - i_skip, i_payload_length_type) < 0)
-+                break;
-         }
-         else
-         {
-@@ -645,6 +669,7 @@ static int DemuxPacket( demux_t *p_demux
-                 return 0;
-             }
-             i_packet_size_left -= i_read;
-+            peek_size = 0;
- 
-             p_frag->p_buffer += i_skip;
-             p_frag->i_buffer -= i_skip;
-@@ -672,6 +697,7 @@ static int DemuxPacket( demux_t *p_demux
-                     msg_Warn( p_demux, "cannot peek, EOF ?" );
-                     return 0;
-                 }
-+                peek_size = i_packet_size_left;
-             }
-         }
-     }
diff --git a/multimedia/vlc2/patches/patch-configure.ac b/multimedia/vlc2/patches/patch-configure.ac
deleted file mode 100644
index 5ae5880393b..00000000000
--- a/multimedia/vlc2/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/01/21 16:25:21 wiz Exp $
-
-automake-1.13 compat.
-
---- configure.ac.orig	2012-10-22 09:03:51.000000000 +0000
-+++ configure.ac
-@@ -25,7 +25,7 @@ AC_CANONICAL_HOST
- AC_PRESERVE_HELP_ORDER
- 
- AM_INIT_AUTOMAKE(tar-ustar color-tests)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- # Disable with "./configure --disable-silent-rules" or "make V=1"
- AM_SILENT_RULES([yes])