corporate2/devel/multimedia/video/mplayer - Bump snapshot to 32438, ffmpeg 25334

Onur Küçük paketler-commits at pardus.org.tr
Mon Oct 4 19:31:57 EEST 2010 

Author: onur
Date: Mon Oct  4 19:31:57 2010
New Revision: 101733

Modified:
   corporate2/devel/multimedia/video/mplayer/   (props changed)
   corporate2/devel/multimedia/video/mplayer/actions.py
   corporate2/devel/multimedia/video/mplayer/files/mplayer-vaapi-0.29.patch
   corporate2/devel/multimedia/video/mplayer/files/mplayer-vaapi.patch
   corporate2/devel/multimedia/video/mplayer/files/mplayer-vdpau.patch
   corporate2/devel/multimedia/video/mplayer/files/noframeskiplog.patch
   corporate2/devel/multimedia/video/mplayer/files/remove_vfw_bframe_warning.patch
   corporate2/devel/multimedia/video/mplayer/files/x264_revert.patch
   corporate2/devel/multimedia/video/mplayer/pspec.xml
Log:
Bump snapshot to 32438, ffmpeg 25334
Fix several security issues in flicvideo, fixes CVE-2010-3429 bug #14527 #14530 #14531
Depend on new lame

BUG:COMMENT:14527
BUG:FIXED:14531




---
 actions.py                            |    8 -
 files/mplayer-vaapi-0.29.patch        |   34 ++---
 files/mplayer-vaapi.patch             |   10 -
 files/mplayer-vdpau.patch             |  212 +++++++++++++++++-----------------
 files/noframeskiplog.patch            |    6 
 files/remove_vfw_bframe_warning.patch |    6 
 files/x264_revert.patch               |    6 
 pspec.xml                             |   17 ++
 8 files changed, 158 insertions(+), 141 deletions(-)

Modified: corporate2/devel/multimedia/video/mplayer/actions.py
=================================================================
--- corporate2/devel/multimedia/video/mplayer/actions.py	(original)
+++ corporate2/devel/multimedia/video/mplayer/actions.py	Mon Oct  4 19:31:57 2010
@@ -15,8 +15,8 @@
 
 WorkDir = "mplayer"
 gcc_version = "4.3.5"
-mp_version = "32161"
-ff_version = "25106"
+mp_version = "32438"
+ff_version = "25334"
 
 
 def fixPermissions(dest):
@@ -36,8 +36,8 @@
     shelltools.echo("version.sh", 'echo "#define MP_TITLE \\\"%s \\\"VERSION\\\" (C) 2000-2010 MPlayer Team\\n\\\"" >> version.h')
     shelltools.chmod("version.sh", 0755)
 
-    shelltools.export("CFLAGS", "%s -O3 -ffast-math -fomit-frame-pointer" % get.CFLAGS())
-    shelltools.export("CXXFLAGS", "%s -O3 -ffast-math -fomit-frame-pointer" % get.CXXFLAGS())
+    shelltools.export("CFLAGS", "%s -O3" % get.CFLAGS())
+    shelltools.export("CXXFLAGS", "%s -O3" % get.CXXFLAGS())
 
     autotools.rawConfigure('--prefix=/usr \
                             --confdir=/usr/share/mplayer \

Modified: corporate2/devel/multimedia/video/mplayer/files/mplayer-vaapi-0.29.patch
=================================================================
--- corporate2/devel/multimedia/video/mplayer/files/mplayer-vaapi-0.29.patch	(original)
+++ corporate2/devel/multimedia/video/mplayer/files/mplayer-vaapi-0.29.patch	Mon Oct  4 19:31:57 2010
@@ -63,11 +63,11 @@
  $def_vaapi_glx
  $def_vdpau
  $def_vesa
-diff --git a/libavcodec/vaapi_compat.h b/libavcodec/vaapi_compat.h
+diff --git a/ffmpeg/libavcodec/vaapi_compat.h b/ffmpeg/libavcodec/vaapi_compat.h
 new file mode 100644
 index 0000000..f463118
 --- /dev/null
-+++ b/libavcodec/vaapi_compat.h
++++ b/ffmpeg/libavcodec/vaapi_compat.h
 @@ -0,0 +1,92 @@
 +/*
 + * Video Acceleration API (video decoding)
@@ -161,10 +161,10 @@
 +#endif
 +
 +#endif /* AVCODEC_VAAPI_COMPAT_H */
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
+diff --git a/ffmpeg/libavcodec/vaapi_h264.c b/ffmpeg/libavcodec/vaapi_h264.c
 index b61a9ca..cab6e41 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
+--- a/ffmpeg/libavcodec/vaapi_h264.c
++++ b/ffmpeg/libavcodec/vaapi_h264.c
 @@ -123,8 +123,8 @@ static void fill_vaapi_pic(VAPictureH264 *va_pic,
      if (pic_structure == 0)
          pic_structure = pic->reference;
@@ -255,10 +255,10 @@
  
      /* Fill in VAIQMatrixBufferH264. */
      iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferH264));
-diff --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h
+diff --git a/ffmpeg/libavcodec/vaapi_internal.h b/ffmpeg/libavcodec/vaapi_internal.h
 index 2c0fdf9..ff83b96 100644
---- a/libavcodec/vaapi_internal.h
-+++ b/libavcodec/vaapi_internal.h
+--- a/ffmpeg/libavcodec/vaapi_internal.h
++++ b/ffmpeg/libavcodec/vaapi_internal.h
 @@ -24,8 +24,14 @@
  #ifndef AVCODEC_VAAPI_INTERNAL_H
  #define AVCODEC_VAAPI_INTERNAL_H
@@ -274,10 +274,10 @@
  #include "avcodec.h"
  #include "mpegvideo.h"
  
-diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
+diff --git a/ffmpeg/libavcodec/vaapi_mpeg2.c b/ffmpeg/libavcodec/vaapi_mpeg2.c
 index 2e870dc..637546a 100644
---- a/libavcodec/vaapi_mpeg2.c
-+++ b/libavcodec/vaapi_mpeg2.c
+--- a/ffmpeg/libavcodec/vaapi_mpeg2.c
++++ b/ffmpeg/libavcodec/vaapi_mpeg2.c
 @@ -52,24 +52,24 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
      pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG2));
      if (!pic_param)
@@ -330,10 +330,10 @@
      slice_param->slice_vertical_position        = s->mb_y;
      slice_param->quantiser_scale_code           = quantiser_scale_code;
      slice_param->intra_slice_flag               = intra_slice_flag;
-diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
+diff --git a/ffmpeg/libavcodec/vaapi_mpeg4.c b/ffmpeg/libavcodec/vaapi_mpeg4.c
 index 466ce2f..ea306a4 100644
---- a/libavcodec/vaapi_mpeg4.c
-+++ b/libavcodec/vaapi_mpeg4.c
+--- a/ffmpeg/libavcodec/vaapi_mpeg4.c
++++ b/ffmpeg/libavcodec/vaapi_mpeg4.c
 @@ -54,42 +54,42 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
      pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG4));
      if (!pic_param)
@@ -420,10 +420,10 @@
          iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferMPEG4));
          if (!iq_matrix)
              return -1;
-diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
+diff --git a/ffmpeg/libavcodec/vaapi_vc1.c b/ffmpeg/libavcodec/vaapi_vc1.c
 index 992e1da..8264dd9 100644
---- a/libavcodec/vaapi_vc1.c
-+++ b/libavcodec/vaapi_vc1.c
+--- a/ffmpeg/libavcodec/vaapi_vc1.c
++++ b/ffmpeg/libavcodec/vaapi_vc1.c
 @@ -146,100 +146,100 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
      pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferVC1));
      if (!pic_param)

Modified: corporate2/devel/multimedia/video/mplayer/files/mplayer-vaapi.patch
=================================================================
--- corporate2/devel/multimedia/video/mplayer/files/mplayer-vaapi.patch	(original)
+++ corporate2/devel/multimedia/video/mplayer/files/mplayer-vaapi.patch	Mon Oct  4 19:31:57 2010
@@ -48,15 +48,15 @@
    --enable-xvmc            enable XvMC acceleration [disable]
    --enable-vdpau           enable VDPAU acceleration [autodetect]
 @@ -603,8 +607,7 @@
- libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
+ libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
  libavbsfs=$libavbsfs_all
- libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *\(.*\)).*/\1_hwaccel/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
+ libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *\(.*\)).*/\1_hwaccel/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
 -# Disable all hardware accelerators for now.
 -libavhwaccels=
 +libavhwaccels=$(for h in $libavhwaccels_all; do case $h in (*_VAAPI_HWACCEL) echo $h;; esac; done)
- libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
+ libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
  libavdemuxers=$(echo $libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//)
- libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
+ libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
 @@ -621,11 +624,15 @@
  _libavcodec_mpegaudio_hp=yes
  _mencoder=yes
@@ -1257,7 +1257,7 @@
 +#include "libavcodec/vaapi.h"
 +#include "gui/interface.h"
 +#include "stats.h"
-+#include "libass/ass_mp.h"
++#include "ass_mp.h"
 +#include <stdarg.h>
 +
 +#if CONFIG_GL

Modified: corporate2/devel/multimedia/video/mplayer/files/mplayer-vdpau.patch
=================================================================
Suppressed!
	Too long (more than 250 lines) diff output suppressed...
Modified: corporate2/devel/multimedia/video/mplayer/files/noframeskiplog.patch
=================================================================
--- corporate2/devel/multimedia/video/mplayer/files/noframeskiplog.patch	(original)
+++ corporate2/devel/multimedia/video/mplayer/files/noframeskiplog.patch	Mon Oct  4 19:31:57 2010
@@ -1,6 +1,6 @@
-diff -Nur mplayer-20100210-old/libavcodec/mpeg4videodec.c mplayer-20100210/libavcodec/mpeg4videodec.c
---- mplayer-20100210-old/libavcodec/mpeg4videodec.c	2010-02-11 01:36:53.087692337 +0200
-+++ mplayer-20100210/libavcodec/mpeg4videodec.c	2010-02-11 01:39:21.580695682 +0200
+diff -Nur mplayer-20100210-old/ffmpeg/libavcodec/mpeg4videodec.c mplayer-20100210/ffmpeg/libavcodec/mpeg4videodec.c
+--- mplayer-20100210-old/ffmpeg/libavcodec/mpeg4videodec.c	2010-02-11 01:36:53.087692337 +0200
++++ mplayer-20100210/ffmpeg/libavcodec/mpeg4videodec.c	2010-02-11 01:39:21.580695682 +0200
 @@ -2119,7 +2119,6 @@
      for(;;) {
          if(get_bits_count(gb) >= gb->size_in_bits){

Modified: corporate2/devel/multimedia/video/mplayer/files/remove_vfw_bframe_warning.patch
=================================================================
--- corporate2/devel/multimedia/video/mplayer/files/remove_vfw_bframe_warning.patch	(original)
+++ corporate2/devel/multimedia/video/mplayer/files/remove_vfw_bframe_warning.patch	Mon Oct  4 19:31:57 2010
@@ -1,6 +1,6 @@
-diff -Nur mplayer-20100114-old/libavcodec/mpeg4videodec.c mplayer-20100114/libavcodec/mpeg4videodec.c
---- mplayer-20100114-old/libavcodec/mpeg4videodec.c	2010-01-14 18:44:53.028930284 +0200
-+++ mplayer-20100114/libavcodec/mpeg4videodec.c	2010-01-14 18:45:55.229814312 +0200
+diff -Nur mplayer-20100114-old/ffmpeg/libavcodec/mpeg4videodec.c mplayer-20100114/ffmpeg/libavcodec/mpeg4videodec.c
+--- mplayer-20100114-old/ffmpeg/libavcodec/mpeg4videodec.c	2010-01-14 18:44:53.028930284 +0200
++++ mplayer-20100114/ffmpeg/libavcodec/mpeg4videodec.c	2010-01-14 18:45:55.229814312 +0200
 @@ -1851,7 +1851,7 @@
          s->divx_build= build;
          s->divx_packed= e==3 && last=='p';

Modified: corporate2/devel/multimedia/video/mplayer/files/x264_revert.patch
=================================================================
--- corporate2/devel/multimedia/video/mplayer/files/x264_revert.patch	(original)
+++ corporate2/devel/multimedia/video/mplayer/files/x264_revert.patch	Mon Oct  4 19:31:57 2010
@@ -10,10 +10,10 @@
  #error We do not support old versions of x264. Get the latest from git.
  #endif
  int main(void) { x264_encoder_open((void*)0); return 0; }
-Index: libavcodec/libx264.c
+Index: ffmpeg/libavcodec/libx264.c
 ===================================================================
---- libavcodec/libx264.c	(revision 23430)
-+++ libavcodec/libx264.c	(revision 23429)
+--- ffmpeg/libavcodec/libx264.c	(revision 23430)
++++ ffmpeg/libavcodec/libx264.c	(revision 23429)
 @@ -89,7 +89,6 @@
      int nnal, i;
      x264_picture_t pic_out;

Modified: corporate2/devel/multimedia/video/mplayer/pspec.xml
=================================================================
--- corporate2/devel/multimedia/video/mplayer/pspec.xml	(original)
+++ corporate2/devel/multimedia/video/mplayer/pspec.xml	Mon Oct  4 19:31:57 2010
@@ -14,7 +14,7 @@
         <IsA>app:console</IsA>
         <Summary>Media Player for Linux</Summary>
         <Description>MPlayer is a movie player that can run on many platforms. It plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, RealMedia, Matroska, NUT, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files, supported by many native codecs.</Description>
-        <Archive sha1sum="595eebb06957550120ec66307c70dddde50d6ebb" type="targz">http://cekirdek.pardus.org.tr/~onur/distfiles/mplayer-32161.tar.gz</Archive>
+        <Archive sha1sum="1bc77d090cb7138234fb315303f08492d58a06c7" type="targz">http://cekirdek.pardus.org.tr/~onur/distfiles/mplayer-32438.tar.gz</Archive>
         <Archive sha1sum="6f7522a14c7ff0083990d32f213ff6d8e577821e" type="targz" target="mplayer">http://cekirdek.pardus.org.tr/~onur/distfiles/MPlayer_default_skin-0.1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>DirectFB</Dependency>
@@ -27,7 +27,7 @@
             <Dependency>glib2</Dependency>
             <Dependency versionFrom="2.18.5">gtk2</Dependency>
             <Dependency>ladspa-sdk</Dependency>
-            <Dependency>lame</Dependency>
+            <Dependency versionFrom="3.98.4">lame</Dependency>
             <Dependency>libcaca</Dependency>
             <Dependency>libdca</Dependency>
             <Dependency>libdv</Dependency>
@@ -153,7 +153,7 @@
             <Dependency>glib2</Dependency>
             <Dependency versionFrom="2.18.5">gtk2</Dependency>
             <Dependency>ladspa-sdk</Dependency>
-            <Dependency>lame</Dependency>
+            <Dependency versionFrom="3.98.4">lame</Dependency>
             <Dependency>libcaca</Dependency>
             <Dependency>libdca</Dependency>
             <Dependency>libdv</Dependency>
@@ -225,6 +225,17 @@
     </Package>
 
     <History>
+        <Update release="135" type="security">
+            <Date>2010-10-04</Date>
+            <Version>0.0_20101004</Version>
+            <Comment>
+                Bump snapshot to 32438, ffmpeg 25334
+                Fix several security issues in flicvideo, fixes CVE-2010-3429 bug #14527 #14530 #14531
+                Depend on new lame
+            </Comment>
+            <Name>Onur Küçük</Name>
+            <Email>onur at pardus.org.tr</Email>
+        </Update>
         <Update release="134">
             <Date>2010-09-11</Date>
             <Version>0.0_20100911</Version>

More information about the paketler-commits mailing list