Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e9f21f8f4662de922883ca2d71c43de6afbbb2fb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e9f21f8f4662de922883ca2d71c43de6afbbb2fb)
  • Date: Thu, 10 Feb 2011 05:19:56 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

video/vlc/HISTORY | 5 +
video/vlc/PRE_BUILD | 1
video/vlc/vlc-1.1.7-libmatroska-1.1.0.patch | 89
++++++++++++++++++++++++++++
3 files changed, 95 insertions(+)

New commits:
commit e9f21f8f4662de922883ca2d71c43de6afbbb2fb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/vlc: added patch to make vlc compile with libmatroska-1.1.0

diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 67626e7..e8f15e7 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,8 @@
+2011-02-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, vlc-1.1.7-libmatroska-1.1.0.patch: added patch from
gentoo
+ to make vlc compile with libmatroska-1.1.0,
+ cf. http://bugs.gentoo.org/show_bug.cgi?id=353491
+
2011-02-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.7, SECURITY_PATCH=16, VideoLAN-SA-1102
* vlc.gpg: added key 45C11CA7, VideoLAN Release Signing Key (2011)
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 02c2ea1..c4cb3fe 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p1 < ${SCRIPT_DIRECTORY}/vlc-1.1.7-libmatroska-1.1.0.patch &&

MOZ_MAKEFILE="projects/mozilla/Makefile.in" &&
if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
diff --git a/video/vlc/vlc-1.1.7-libmatroska-1.1.0.patch
b/video/vlc/vlc-1.1.7-libmatroska-1.1.0.patch
new file mode 100644
index 0000000..3ce3cb7
--- /dev/null
+++ b/video/vlc/vlc-1.1.7-libmatroska-1.1.0.patch
@@ -0,0 +1,89 @@
+diff -urN vlc-1.1.7.orig/modules/demux/mkv/matroska_segment.cpp
vlc-1.1.7/modules/demux/mkv/matroska_segment.cpp
+--- vlc-1.1.7.orig/modules/demux/mkv/matroska_segment.cpp 2011-02-02
13:45:56.115863316 +0100
++++ vlc-1.1.7/modules/demux/mkv/matroska_segment.cpp 2011-02-02
13:55:23.957416146 +0100
+@@ -220,74 +220,6 @@
+ }
+ 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() );
+diff -urN vlc-1.1.7.orig/modules/demux/mkv/mkv.hpp
vlc-1.1.7/modules/demux/mkv/mkv.hpp
+--- vlc-1.1.7.orig/modules/demux/mkv/mkv.hpp 2011-02-02 13:45:56.114863318
+0100
++++ vlc-1.1.7/modules/demux/mkv/mkv.hpp 2011-02-02 13:46:08.647832555
+0100
+@@ -92,7 +92,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"



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e9f21f8f4662de922883ca2d71c43de6afbbb2fb), Florian Franzmann, 02/10/2011

Archive powered by MHonArc 2.6.24.

Top of Page