[76934] trunk/dports/multimedia/VLC

[jeremyhu at macports.org]

Revision: 76934
          http://trac.macports.org/changeset/76934
Author:   jeremyhu at macports.org
Date:     2011-03-13 17:20:01 -0700 (Sun, 13 Mar 2011)
Log Message:
-----------
VLC: BuildFix for newer libmatroska

Modified Paths:
--------------
    trunk/dports/multimedia/VLC/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/VLC/files/patch-noKaxTagMulti.diff

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2011-03-14 00:13:12 UTC (rev 76933)
+++ trunk/dports/multimedia/VLC/Portfile	2011-03-14 00:20:01 UTC (rev 76934)
@@ -46,7 +46,7 @@
     }
 }
 
-patchfiles      patch-Makefile.am.diff patch-configure.ac-xcb.diff patch-png.c.diff patch-configure.ac-no_qtcapture.diff patch-configure.ac-macosx_audio.diff
+patchfiles      patch-Makefile.am.diff patch-configure.ac-xcb.diff patch-png.c.diff patch-configure.ac-no_qtcapture.diff patch-configure.ac-macosx_audio.diff patch-noKaxTagMulti.diff
 
 use_parallel_build no
 use_autoreconf yes

Added: trunk/dports/multimedia/VLC/files/patch-noKaxTagMulti.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-noKaxTagMulti.diff	                        (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-noKaxTagMulti.diff	2011-03-14 00:20:01 UTC (rev 76934)
@@ -0,0 +1,87 @@
+--- modules/demux/mkv/matroska_segment.cpp.orig	2011-03-13 17:17:07.000000000 -0700
++++ modules/demux/mkv/matroska_segment.cpp	2011-03-13 17:17:31.000000000 -0700
+@@ -215,74 +215,6 @@ void matroska_segment_c::LoadTags( KaxTa
+                     }
+                     ep->Up();
+                 }
+-                else if( MKV_IS_ID( el, KaxTagGeneral ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + General" );
+-                    ep->Down();
+-                    while( ( el = ep->Get() ) != NULL )
+-                    {
+-                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
+-                    }
+-                    ep->Up();
+-                }
+-                else if( MKV_IS_ID( el, KaxTagGenres ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Genres" );
+-                    ep->Down();
+-                    while( ( el = ep->Get() ) != NULL )
+-                    {
+-                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
+-                    }
+-                    ep->Up();
+-                }
+-                else if( MKV_IS_ID( el, KaxTagAudioSpecific ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Audio Specific" );
+-                    ep->Down();
+-                    while( ( el = ep->Get() ) != NULL )
+-                    {
+-                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
+-                    }
+-                    ep->Up();
+-                }
+-                else if( MKV_IS_ID( el, KaxTagImageSpecific ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Images Specific" );
+-                    ep->Down();
+-                    while( ( el = ep->Get() ) != NULL )
+-                    {
+-                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
+-                    }
+-                    ep->Up();
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiComment ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Comment" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiCommercial ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Commercial" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiDate ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Date" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiEntity ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Entity" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Identifier" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiLegal ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Legal" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiTitle ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Title" );
+-                }
+                 else
+                 {
+                     msg_Dbg( &sys.demuxer, "|   + LoadTag Unknown (%s)", typeid( *el ).name() );
+--- modules/demux/mkv/mkv.hpp.orig	2011-03-13 17:17:39.000000000 -0700
++++ modules/demux/mkv/mkv.hpp	2011-03-13 17:17:49.000000000 -0700
+@@ -93,7 +93,6 @@
+ #include "matroska/KaxSegment.h"
+ #include "matroska/KaxTag.h"
+ #include "matroska/KaxTags.h"
+-#include "matroska/KaxTagMulti.h"
+ #include "matroska/KaxTracks.h"
+ #include "matroska/KaxTrackAudio.h"
+ #include "matroska/KaxTrackVideo.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110313/fb4607cd/attachment.html>