update to 1.1.7

changes:
-fix for CVE-2011-0531 (was patched in pkgsrc)
-improvements to codecs, demuxers, Audio-CD
 support, subtitles, visualization and platform integration

4 files changed, 43 insertions, 20 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index e51a4ffda77..9d068a4f017 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.106 2011/01/31 16:47:56 drochner Exp $
+# $NetBSD: Makefile,v 1.107 2011/02/14 19:03:18 drochner Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		1.1.6
+VLC_VERSION=		1.1.7
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 243ce981652..8d8bedfb4b3 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.41 2011/02/01 11:45:04 drochner Exp $
+$NetBSD: distinfo,v 1.42 2011/02/14 19:03:18 drochner Exp $
 
-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 (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 (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) = 840bfb20fef877541a27edfbd2eaf0da8793cd7e
+SHA1 (patch-au) = 7318b1d40246d5540a67c22565ebd439d5fe069d
+SHA1 (patch-av) = 2d876c99a4bfe2cd964a78fe19dd108d1cb5f550
 SHA1 (patch-configure) = 83f476cc71d795a69f787713a04471e078c0ec52
diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-au
index d59d999c816..5cf5506ebfe 100644
--- a/multimedia/vlc/patches/patch-au
+++ b/multimedia/vlc/patches/patch-au
@@ -1,15 +1,16 @@
-$NetBSD: patch-au,v 1.2 2011/02/01 11:45:05 drochner Exp $
+$NetBSD: patch-au,v 1.3 2011/02/14 19:03:19 drochner Exp $
 
-CVE-2011-0531
+fix build with libmatroska-1.1
 
---- modules/demux/mkv/mkv.hpp.orig	2010-05-21 08:48:24.000000000 +0000
+--- modules/demux/mkv/mkv.hpp.orig	2011-01-30 14:45:14.000000000 +0000
 +++ modules/demux/mkv/mkv.hpp
-@@ -119,7 +119,7 @@ extern "C" {
- 
- #define MKVD_TIMECODESCALE 1000000
- 
--#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
-+#define MKV_IS_ID( el, C ) ( el != NULL && typeid( *el ) == typeid( C ) )
- 
- 
- using namespace LIBMATROSKA_NAMESPACE;
+@@ -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
new file mode 100644
index 00000000000..ad6d43688e3
--- /dev/null
+++ b/multimedia/vlc/patches/patch-av
@@ -0,0 +1,22 @@
+$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() );