From 98bf3f9d395f538d83ae5c335b3a0f251ca84c21 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 3 Feb 2015 15:41:37 -0500 Subject: [PATCH 1/3] x264: snapshot-20130424-2245-stable -> snapshot-20141218-2245-stable Update fixes configure error on Darwin --- pkgs/development/libraries/x264/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 51666e3ba6d..c440493072e 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, yasm}: stdenv.mkDerivation rec { - version = "snapshot-20130424-2245-stable"; - name = "x264-20130424_2245"; + version = "snapshot-20141218-2245-stable"; + name = "x264-20141218-2245"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "0vzyqsgrm9k3hzka2p8ib92jl0ha8d4267r2rb3pr9gmpjaj9azk"; + sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m"; }; patchPhase = '' From 3630a37dd5330fb1c681597b294abe41186362ba Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 25 Mar 2015 18:10:08 -0400 Subject: [PATCH 2/3] x264: Add option to encode videos as bit depth 10 At compile time libx264 must be configured to encode videos in either 8 bit depth or 10 bit depth. It is not possible to compile libx264 to support both bit depths simultaneously. This exposes the bit depth compile option. --- pkgs/development/libraries/x264/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index c440493072e..9422a8f9ab0 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, yasm}: +{stdenv, fetchurl, yasm, enable10bit ? false}: stdenv.mkDerivation rec { version = "snapshot-20141218-2245-stable"; @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { ''; 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 ]; From 84a15d6d0865e9cc58d78dd68f3ff793248a1956 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 25 Mar 2015 18:13:47 -0400 Subject: [PATCH 3/3] x264: Update metadata --- pkgs/development/libraries/x264/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 9422a8f9ab0..6c541f1aa68 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -19,9 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ yasm ]; - meta = { + meta = with stdenv.lib; { description = "library for encoding H264/AVC video streams"; - homepage = http://www.videolan.org/developers/x264.html; - license = "GPL"; + homepage = http://www.videolan.org/developers/x264.html; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.spwhitt ]; }; }