Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.54 grimoire by George Sherwood (fa05a11a84bcfc0b6ccfe1efff2c1ba58c36c742)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.54 grimoire by George Sherwood (fa05a11a84bcfc0b6ccfe1efff2c1ba58c36c742)
  • Date: Sat, 26 Mar 2011 09:59:45 -0500

GIT changes to stable-0.54 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

video/vlc/DETAILS | 4 -
video/vlc/HISTORY | 4 +
video/vlc/PRE_BUILD | 1
video/vlc/vlc-1.1.7-libmatroska-1.1.0.patch | 89
----------------------------
4 files changed, 6 insertions(+), 92 deletions(-)

New commits:
commit fa05a11a84bcfc0b6ccfe1efff2c1ba58c36c742
Author: Julien ROZO <julien AT rozo.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

vlc: updated version to 1.1.8, SECURITY_PATCH++
removed integrated upstream libmatroska patch
(cherry picked from commit b9850ba7b7390a0195d7930b3a5ebe084fa4763c)

diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index bce0550..f514fad 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,5 +1,5 @@
SPELL=vlc
- VERSION=1.1.7
+ VERSION=1.1.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
ENTERED=20011113
KEYWORDS="player video"
- SECURITY_PATCH=16
+ SECURITY_PATCH=17
SHORT="multimedia player"
cat << EOF
VLC (initially VideoLAN Client) is a highly portable multimedia player for
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index e8f15e7..fd478ce 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,7 @@
+2011-03-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.1.8, SECURITY_PATCH=17
+ * PRE_BUILD, vlc-1.1.7-libmatroska-1.1.0.patch: removed patch, no
longer needed
+
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,
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index c4cb3fe..02c2ea1 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,6 +1,5 @@
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
deleted file mode 100644
index 3ce3cb7..0000000
--- a/video/vlc/vlc-1.1.7-libmatroska-1.1.0.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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 stable-0.54 grimoire by George Sherwood (fa05a11a84bcfc0b6ccfe1efff2c1ba58c36c742), George Sherwood, 03/26/2011

Archive powered by MHonArc 2.6.24.

Top of Page