vlc: updated to 0.8.6a

(cherry picked from commit c0c81c2139848af14c86415f66c1268411c193a5)

7 files changed, 35 insertions, 6 deletions

diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index c726942c88..2e58f517ae 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -132,10 +132,11 @@ optional_depends  "libtheora"              \
                   "--disable-theora"       \
                   "for Theora video support"  &&
 
-optional_depends  "dirac"                  \
-                  "--enable-dirac"         \
-                  "--disable-dirac"        \
-                  "for Dirac video support"  &&
+# broken with dirac 0.6.0
+#optional_depends  "dirac"                  \
+#                  "--enable-dirac"         \
+#                  "--disable-dirac"        \
+#                  "for Dirac video support"  &&
 
 optional_depends  "sdl_image"     \
                   ""              \
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index 57d2b55f0c..5919c05260 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,5 +1,5 @@
            SPELL=vlc
-         VERSION=0.8.5
+         VERSION=0.8.6a
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
@@ -7,8 +7,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
       LICENSE[0]=GPL
          ENTERED=20011113
-         UPDATED=20040529
         KEYWORDS="player video"
+  SECURITY_PATCH=1
            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 6d7efddb98..7a71bec4cc 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,9 @@
+2007-02-14 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DETAILS: updated to 0.8.6a, SECURITY_PATH++
+	  http://www.videolan.org/sa0701.html, CVE-2007-0017
+	* DEPENDS: removed optional_depends on dirac, it's broken
+	* PRE_BUILD, old-faad2.patch: patch to make it work without newer faad2
+
 2006-10-06 Juuso Alasuutari <iuso@sourcemage.org>
 	* DEPENDS: Changed jack to JACK-DRIVER.
 
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index b43756d768..0f7b0e7596 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -8,5 +8,9 @@ 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  &&
+
 # fix png linking
 sedit  's/-lpng -lz/-lpng -lm -lz/'  configure
diff --git a/video/vlc/old-faad2.patch b/video/vlc/old-faad2.patch
new file mode 100644
index 0000000000..b8f0f569a1
--- /dev/null
+++ b/video/vlc/old-faad2.patch
@@ -0,0 +1,18 @@
+--- 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++ )
diff --git a/video/vlc/vlc-0.8.5.tar.bz2.sig b/video/vlc/vlc-0.8.5.tar.bz2.sig
deleted file mode 100644
index 420b68fc3d..0000000000
--- a/video/vlc/vlc-0.8.5.tar.bz2.sig
+++ /dev/null
diff --git a/video/vlc/vlc-0.8.6a.tar.bz2.sig b/video/vlc/vlc-0.8.6a.tar.bz2.sig
new file mode 100644
index 0000000000..3341811b76
--- /dev/null
+++ b/video/vlc/vlc-0.8.6a.tar.bz2.sig