Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

 video/vlc/DETAILS          |    6 +++---
 video/vlc/HISTORY          |    6 ++++++
 video/vlc/PRE_BUILD        |    7 -------
 video/vlc/ffmpeg-api.patch |   14 --------------
 video/vlc/old-faad2.patch  |   18 ------------------
 5 files changed, 9 insertions(+), 42 deletions(-)

New commits:
commit 396e4c09c41653070029737a9d56e151addcafea
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

    vlc 0.8.6e, SECURITY_PATCH=4

diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index f7ff067..12acaf2 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,15 +1,15 @@
            SPELL=vlc
-         VERSION=0.8.6d
+         VERSION=0.8.6e
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
         WEB_SITE=http://www.videolan.org
-     
SOURCE_HASH=sha512:5ab2505b7a4724aa5ddbafdf5dce9944b0fa8ddbb15e689c248f93152b8f8402c1a9d92b6e59819a676dfb2ea829270ec1d008e2c0d808c08bb6d0e22a753f0f
+     
SOURCE_HASH=sha512:92b3a24ff0329ed5df3ac00385bfe418a00fbd26ae9b4f90644d4699bec95e887096104073e8a01c6ecd000f21572d4a024f888262e5aef5504a6161427e5fab
 #      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
       LICENSE[0]=GPL
          ENTERED=20011113
         KEYWORDS="player video"
-  SECURITY_PATCH=3
+  SECURITY_PATCH=4
            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 85dc5e2..78ae34c 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,9 @@
+2008-02-28 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.8.6e, SECURITY_PATCH=4
+         http://www.videolan.org/security/sa0801.php
+         http://www.videolan.org/security/sa0802.php
+       * PRE_BUILD, ffmpeg-api.patch, old-faad2.patch: removed patches
+
 2008-02-19 Arjan Bouter <abouter AT sourcemage.org>
        * BUILD: add --disable-macosx, no idea why that got auto-enabled
 
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 73f6f8d..b43756d 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -8,12 +8,5 @@ elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; 
then
   sedit  's:$(libdir)/mozilla:$(libdir)/xulrunner:'  mozilla/Makefile.in
 fi  &&
 
-# patch to make it not require faad2 2.5, but take advantage of it if it's
-# available
-patch  -p0  <  $SCRIPT_DIRECTORY/old-faad2.patch  &&
-
-# patch for ffmpeg-svn of 2007-11-21, also supports older versions
-patch  -p0  <  $SPELL_DIRECTORY/ffmpeg-api.patch  &&
-
 # fix png linking
 sedit  's/-lpng -lz/-lpng -lm -lz/'  configure
diff --git a/video/vlc/ffmpeg-api.patch b/video/vlc/ffmpeg-api.patch
deleted file mode 100644
index 03037a6..0000000
--- a/video/vlc/ffmpeg-api.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- modules/codec/ffmpeg/mux.c.orig    2007-11-21 21:47:16.000000000 +0100
-+++ modules/codec/ffmpeg/mux.c 2007-11-21 21:49:41.000000000 +0100
-@@ -133,7 +133,11 @@
-         return VLC_EGENERIC;
-     }
- 
-+#if (LIBAVFORMAT_BUILD >= ((52<<16)+(0<<8)+0))
-+    p_sys->oc->pb = &p_sys->io;
-+#else
-     p_sys->oc->pb = p_sys->io;
-+#endif
-     p_sys->oc->nb_streams = 0;
- 
-     p_sys->b_write_header = VLC_TRUE;
diff --git a/video/vlc/old-faad2.patch b/video/vlc/old-faad2.patch
deleted file mode 100644
index b8f0f56..0000000
--- a/video/vlc/old-faad2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- modules/codec/faad.c~      2007-02-15 19:50:20.000000000 +0100
-+++ modules/codec/faad.c       2007-02-15 19:50:23.000000000 +0100
-@@ -316,6 +316,7 @@
-         p_dec->fmt_out.audio.i_channels = frame.channels;
- 
-         /* Adjust stream info when dealing with SBR/PS */
-+#ifdef NEAACDECAPI
-         if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&
-             p_dec->p_parent->i_object_type == VLC_OBJECT_INPUT )
-         {
-@@ -336,6 +337,7 @@
-           free( psz_cat );
-           p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
-         }
-+#endif
- 
-         /* Convert frame.channel_position to our own channel values */
-         for( i = 0; i < frame.channels; i++ )