Updating x264, and adding x264 support to mplayer and ffmpeg.

svn path=/nixpkgs/trunk/; revision=21451

4 files changed, 20 insertions, 12 deletions

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 6d2de592f428..c9cd1909421c 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -6,6 +6,7 @@
 , cdparanoia ? null, cddaSupport ? true
 , amrnb ? null, amrwb ? null, amrSupport ? false
 , jackaudioSupport ? false, jackaudio ? null
+, x264Support ? false, x264 ? null
 , mesa, pkgconfig, unzip
 }:
 
@@ -61,11 +62,13 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
     ++ stdenv.lib.optional cddaSupport cdparanoia
     ++ stdenv.lib.optional jackaudioSupport jackaudio
-    ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ];
+    ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]
+    ++ stdenv.lib.optional x264Support x264;
 
   configureFlags = ''
     ${if cacaSupport then "--enable-caca" else "--disable-caca"}
     ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
+    ${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""}
     --codecsdir=${codecs}
     --enable-runtime-cpudetection
     --enable-x11
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index cdb9bb887e82..1650c6141f4c 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, faad2, libtheora, speex, libvorbis}:
+{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig}:
 
 stdenv.mkDerivation {
   name = "ffmpeg-0.5.1";
@@ -22,9 +22,10 @@ stdenv.mkDerivation {
     --enable-libtheora
     --enable-libvorbis
     --enable-libspeex
+    --enable-libx264
   '';
 
-  buildInputs = [faad2 libtheora speex libvorbis];
+  buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig];
 
   meta = {
     homepage = http://www.ffmpeg.org/;
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 636a5081c5f0..606fd825d161 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -1,16 +1,19 @@
-args:
-args.stdenv.mkDerivation rec {
-  version = "snapshot-20080521-2245";
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "snapshot-20100429-2245";
   name = "x264-${version}";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
-    sha256 = "07khxih1lmhvrzlaksqmaghbi8w2yyjrjcw867gi2y4z1h0ndhks";
+    sha256 = "16b24mc63zyp4h4fqyvgzbdclnhpay4l72yfqzwnzsnlby94zwcj";
   };
 
-  configureFlags= if args.stdenv.system == "x86_64-linux" then ["--enable-pic"] else [];
+  patchPhase = ''
+    sed -i s,/bin/bash,${stdenv.bash}/bin/bash, configure version.sh
+  '';
 
-  buildInputs =(with args; []);
+  configureFlags = [ "--disable-asm" "--enable-shared" ];
 
   meta = { 
       description = "library for encoding H264/AVC video streams";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 386c8cb0730b..fdaf25b1c7d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3645,7 +3645,7 @@ let
   };
 
   ffmpeg = import ../development/libraries/ffmpeg {
-    inherit fetchurl stdenv faad2 libvorbis speex libtheora;
+    inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig;
   };
 
   fftw = import ../development/libraries/fftw {
@@ -7877,7 +7877,7 @@ let
 
   MPlayer = import ../applications/video/MPlayer {
     inherit fetchurl stdenv freetype fontconfig x11 zlib libtheora libcaca libdvdnav
-      cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio;
+      cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264;
     inherit (xlibs) libX11 libXv libXinerama libXrandr;
     alsaSupport = true;
     alsa = alsaLib;
@@ -7887,6 +7887,7 @@ let
     randrSupport = true;
     cddaSupport = true;
     amrSupport = getConfig [ "MPlayer" "amr" ] false;
+    x264Support = true;
   };
 
   MPlayerPlugin = browser: