Update to 1.1.3 and chase them libmatroska update.

Approved by:	kwm (mentor)

4 files changed, 5 insertions, 61 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index ff8156ea4b39..d888c4fd5e73 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vlc
-DISTVERSION=	1.1.2
-PORTREVISION=	1
+DISTVERSION=	1.1.3
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -373,7 +372,7 @@ CONFIGURE_ARGS+=--enable-mad --with-mad=${LOCALBASE}
 .if defined(WITHOUT_MATROSKA)
 CONFIGURE_ARGS+=--disable-mkv
 .else
-LIB_DEPENDS+=	matroska.0:${PORTSDIR}/multimedia/libmatroska
+LIB_DEPENDS+=	matroska.2:${PORTSDIR}/multimedia/libmatroska
 CONFIGURE_ARGS+=--enable-mkv
 .endif
 
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 620c1b1c70f8..a9ad2bad56e7 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-1.1.2.tar.bz2) = dec11ed850e044c518aee6fef7e7f893
-SHA256 (vlc-1.1.2.tar.bz2) = db95e8667534e44f26c053e9f3f470d37c06d5ece10d2645cf2f7c25880a33f7
-SIZE (vlc-1.1.2.tar.bz2) = 23445745
+MD5 (vlc-1.1.3.tar.bz2) = b8ba8b6687d19dadcf3eb148ca525603
+SHA256 (vlc-1.1.3.tar.bz2) = 128c31f8c5cebbc947c2cf337cfb1877350f7e282826c76dc69e1218765e83e5
+SIZE (vlc-1.1.3.tar.bz2) = 23887407
diff --git a/multimedia/vlc/files/patch-VideoLAN-SA-1004 b/multimedia/vlc/files/patch-VideoLAN-SA-1004
deleted file mode 100644
index e2301aa19502..000000000000
--- a/multimedia/vlc/files/patch-VideoLAN-SA-1004
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
-index 9ddb26e..e927148 100644
---- modules/meta_engine/taglib.cpp
-+++ modules/meta_engine/taglib.cpp
-@@ -131,6 +131,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
-     {
-         ID3v2::UniqueFileIdentifierFrame* p_ufid =
-                 dynamic_cast<ID3v2::UniqueFileIdentifierFrame*>(*iter);
-+        if( !p_ufid )
-+            continue;
-         const char *owner = p_ufid->owner().toCString();
-         if (!strcmp( owner, "http://musicbrainz.org" ))
-         {
-@@ -151,6 +153,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
-     {
-         ID3v2::UserTextIdentificationFrame* p_txxx =
-                 dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter);
-+        if( !p_txxx )
-+            continue;
-         vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ),
-                            p_txxx->fieldList().toString().toCString( true ) );
-     }
-@@ -207,6 +211,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
-     {
-         ID3v2::AttachedPictureFrame* p_apic =
-             dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
-+        if( !p_apic )
-+            continue;
-         input_attachment_t *p_attachment;
- 
-         const char *psz_mime;
diff --git a/multimedia/vlc/files/patch-include_limits.h b/multimedia/vlc/files/patch-include_limits.h
deleted file mode 100644
index a949e970ae92..000000000000
--- a/multimedia/vlc/files/patch-include_limits.h
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/modules/gui/skins2/x11/x11_factory.cpp b/modules/gui/skins2/x11/x11_factory.cpp
-index 79fdcaa..a916cfa 100644
---- modules/gui/skins2/x11/x11_factory.cpp
-+++ modules/gui/skins2/x11/x11_factory.cpp
-@@ -28,6 +28,7 @@
- #include <dirent.h>
- #include <sys/stat.h>
- #include <X11/Xlib.h>
-+#include <limits.h>
- 
- #include "x11_factory.hpp"
- #include "x11_display.hpp"
-diff --git a/modules/gui/skins2/x11/x11_window.cpp b/modules/gui/skins2/x11/x11_window.cpp
-index 64fa4ae..e9e85de 100644
---- modules/gui/skins2/x11/x11_window.cpp
-+++ modules/gui/skins2/x11/x11_window.cpp
-@@ -25,6 +25,7 @@
- #ifdef X11_SKINS
- 
- #include <X11/Xatom.h>
-+#include <limits.h>
- 
- #include "../src/generic_window.hpp"
- #include "../src/vlcproc.hpp"