- upstream fix for libmatroska 1.1.0

Changed files:
    vlc-mkv.patch -> 1.1
    vlc.spec -> 1.249

diff --git a/vlc-mkv.patch b/vlc-mkv.patch
new file mode 100644 (file)
index 0000000..c156928
--- /dev/null
+++ b/vlc-mkv.patch
@@ -0,0 +1,47 @@
+From 7be936ca451fa0c052069895460dcc0e67f4dfa3 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@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@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
+

diff --git a/vlc.spec b/vlc.spec
index 5e0e637a70e6201e1d794bef2e9a546f64576f60..c7ad389ff4c961f29820b21a9cbf213ca4f739db 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@ Summary:      VLC - a multimedia player and stream server
 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
@@ -53,6 +53,7 @@ Patch1:               %{name}-defaultfont.patch
 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
@@ -268,6 +269,7 @@ Wtyczka do przeglądarki internetowej Mozilla.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* .