packages: vlc/vlc.spec, vlc/vlc-mkv.patch (NEW) - upstream fix for libmatro...

[baggins]

Author: baggins                      Date: Mon Feb 28 12:18:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upstream fix for libmatroska 1.1.0

---- Files affected:
packages/vlc:
   vlc.spec (1.248 -> 1.249) , vlc-mkv.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.248 packages/vlc/vlc.spec:1.249
--- packages/vlc/vlc.spec:1.248	Sun Feb 27 08:53:51 2011
+++ packages/vlc/vlc.spec	Mon Feb 28 13:18:04 2011
@@ -43,7 +43,7 @@
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
 Version:	1.1.7
-Release:	4
+Release:	4.1
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
@@ -54,6 +54,7 @@
 Patch2:		%{name}-osdmenu_path.patch
 Patch3:		%{name}-system-minizip.patch
 Patch4:		%{name}-upnp.patch
+Patch5:		%{name}-mkv.patch
 URL:		http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	OpenGL-devel
@@ -269,6 +270,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -811,6 +813,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.249  2011/02/28 12:18:04  baggins
+- upstream fix for libmatroska 1.1.0
+
 Revision 1.248  2011/02/27 07:53:51  arekm
 - release 4
 

================================================================
Index: packages/vlc/vlc-mkv.patch
diff -u /dev/null packages/vlc/vlc-mkv.patch:1.1
--- /dev/null	Mon Feb 28 13:18:10 2011
+++ packages/vlc/vlc-mkv.patch	Mon Feb 28 13:18:04 2011
@@ -0,0 +1,47 @@
+From 7be936ca451fa0c052069895460dcc0e67f4dfa3 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at robux4-desktop.(none)>
+Date: Fri, 28 Jan 2011 18:57:50 +0100
+Subject: [PATCH] MKV: Multi tags don't exist anymore
+
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ modules/demux/mkv/matroska_segment.cpp |    2 ++
+ modules/demux/mkv/mkv.hpp              |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
+index 2856b93..fac4f45 100644
+--- a/modules/demux/mkv/matroska_segment.cpp
++++ b/modules/demux/mkv/matroska_segment.cpp
+@@ -267,6 +267,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
+             {
+                 if( MKV_IS_ID( el, KaxTagTargets ) )
+                     PARSE_TAG( "Targets" );
++#if 0 // not valid anymore
+                 else if( MKV_IS_ID( el, KaxTagGeneral ) )
+                     PARSE_TAG( "General" );
+                 else if( MKV_IS_ID( el, KaxTagGenres ) )
+@@ -303,6 +304,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
+                 {
+                     msg_Dbg( &sys.demuxer, "|   + Multi Title" );
+                 }
++#endif
+                 else if( MKV_IS_ID( el, KaxTagSimple ) )
+                     ParseSimpleTags( static_cast<KaxTagSimple*>( el ) );
+                 else
+diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
+index 664cafa..c7b6194 100644
+--- a/modules/demux/mkv/mkv.hpp
++++ b/modules/demux/mkv/mkv.hpp
+@@ -86,7 +86,7 @@
+ #include "matroska/KaxSegment.h"
+ #include "matroska/KaxTag.h"
+ #include "matroska/KaxTags.h"
+-#include "matroska/KaxTagMulti.h"
++//#include "matroska/KaxTagMulti.h"
+ #include "matroska/KaxTracks.h"
+ #include "matroska/KaxTrackAudio.h"
+ #include "matroska/KaxTrackVideo.h"
+-- 
+1.6.5.GIT
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.248&r2=1.249&f=u