/[packages]/cauldron/mplayer/current/SPECS/mplayer.spec
ViewVC logotype

Diff of /cauldron/mplayer/current/SPECS/mplayer.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 196705 by luigiwalser, Mon Jan 16 04:13:16 2012 UTC revision 196890 by luigiwalser, Mon Jan 16 15:53:05 2012 UTC
# Line 221  Patch31:       mplayer-format-string-literal.p Line 221  Patch31:       mplayer-format-string-literal.p
221  Patch33:        mplayer-have-dlfcn_h.patch  Patch33:        mplayer-have-dlfcn_h.patch
222  #gw fix crash: https://qa.mandriva.com/show_bug.cgi?id=55443  #gw fix crash: https://qa.mandriva.com/show_bug.cgi?id=55443
223  Patch35:        mplayer-fix-dvd-crash.patch  Patch35:        mplayer-fix-dvd-crash.patch
 # rediffed from http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/patches/to_upstream/42_aac_zero_bands.patch?revision=25254&view=markup&pathrev=26428  
 Patch45:        ffmpeg-CVE-2009-4636.patch  
 # rediffed from http://git.videolan.org/?p=ffmpeg.git;a=commit;h=44511b17cbbb524602c91a198e7314fa57a7062a  
 Patch46:        ffmpeg-CVE-2011-0722.patch  
224  # r34397 added some additional checks against the new AVFrame.width/height,  # r34397 added some additional checks against the new AVFrame.width/height,
225  # however FFmpeg 0.9.1 may have -1 in them; it has been fixed in FFmpeg git  # however FFmpeg 0.9.1 may have -1 in them; it has been fixed in FFmpeg git
226  # master, but there are multiple commits concerning this and they don't look  # master, but there are multiple commits concerning this and they don't look
# Line 486  rm -f Blue/README Line 482  rm -f Blue/README
482  %patch35 -p0  %patch35 -p0
483  %patch47 -p1  %patch47 -p1
484    
 %if ! %build_system_ffmpeg  
 pushd ffmpeg  
 %patch45 -p1 -b .CVE-2009-4636  
 %patch46 -p1 -b .CVE-2011-0722  
 popd  
 %endif  
   
485  perl -pi -e 's^r\$svn_revision^%release^' version.sh  perl -pi -e 's^r\$svn_revision^%release^' version.sh
486    
487  mv DOCS/README README.DOCS  mv DOCS/README README.DOCS

Legend:
Removed from v.196705  
changed lines
  Added in v.196890

  ViewVC Help
Powered by ViewVC 1.1.30