3 files changed, 56 insertions, 0 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 0423538e3828..ff8156ea4b39 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
diff --git a/multimedia/vlc/files/patch-VideoLAN-SA-1004 b/multimedia/vlc/files/patch-VideoLAN-SA-1004
new file mode 100644
index 000000000000..e2301aa19502
--- /dev/null
+++ b/multimedia/vlc/files/patch-VideoLAN-SA-1004
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000000..a949e970ae92
--- /dev/null
+++ b/multimedia/vlc/files/patch-include_limits.h
@@ -0,0 +1,24 @@
+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"