Merge pull request #6984 from spwhitt/x264

X264 updates
This commit is contained in:
William A. Kennington III 2015-03-25 15:35:59 -07:00
commit fe6055dc2a

View File

@ -1,12 +1,12 @@
{stdenv, fetchurl, yasm}: {stdenv, fetchurl, yasm, enable10bit ? false}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "snapshot-20130424-2245-stable"; version = "snapshot-20141218-2245-stable";
name = "x264-20130424_2245"; name = "x264-20141218-2245";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
sha256 = "0vzyqsgrm9k3hzka2p8ib92jl0ha8d4267r2rb3pr9gmpjaj9azk"; sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m";
}; };
patchPhase = '' patchPhase = ''
@ -14,13 +14,16 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = [ "--enable-shared" ] configureFlags = [ "--enable-shared" ]
++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"; ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"
++ stdenv.lib.optional (enable10bit) "--bit-depth=10";
buildInputs = [ yasm ]; buildInputs = [ yasm ];
meta = { meta = with stdenv.lib; {
description = "library for encoding H264/AVC video streams"; description = "library for encoding H264/AVC video streams";
homepage = http://www.videolan.org/developers/x264.html; homepage = http://www.videolan.org/developers/x264.html;
license = "GPL"; license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.spwhitt ];
}; };
} }