diff options
| author | José Luis Lafuente <jl@lafuente.me> | 2019-05-24 20:40:18 +0200 |
|---|---|---|
| committer | José Luis Lafuente <jl@lafuente.me> | 2019-05-24 20:40:18 +0200 |
| commit | 2982e92f441e825fd4ae94467300bbbe6ca9cb4a (patch) | |
| tree | 2f97130b96947b10f6323679a02bc51ab9d53911 /pkgs/development/libraries/x265 | |
| parent | 084d75adb8eef4c40bb07248f6f5477940ed0171 (diff) | |
x265: 2.9 -> 3.0
Diffstat (limited to 'pkgs/development/libraries/x265')
| -rw-r--r-- | pkgs/development/libraries/x265/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 7ea28f6b61e8..398c309d938d 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, cmake, yasm +{ stdenv, fetchurl, fetchpatch, cmake, nasm, numactl +, numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms , debugSupport ? false # Run-time sanity checks (debugging) , highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel , werrorSupport ? false # Warnings as errors @@ -16,26 +17,20 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "2.9"; + version = "3.0"; src = fetchurl { urls = [ "https://get.videolan.org/x265/x265_${version}.tar.gz" "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz" ]; - sha256 = "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb"; + sha256 = "0qh65wdpasrspkm1y0dlfa123myax568yi0sas0lmg5b1hkgrff5"; }; enableParallelBuilding = true; patches = [ - # Fix issue #442 (linking issue on non-x86 platforms) - # Applies on v2.9 only, this should be removed at next update - (fetchpatch { - url = "https://bitbucket.org/multicoreware/x265/commits/471726d3a0462739ff8e3518eb1a1e8a01de4e8d/raw"; - sha256 = "0mj8lb8ng8lrhzjavap06vjhqf6j0r3sn76c6rhs3012f86lv928"; - }) - # Fix build on ARM (#406) + # Fix build on ARM (#406) (fetchpatch { url = "https://bitbucket.org/multicoreware/x265/issues/attachments/406/multicoreware/x265/1527562952.26/406/X265-2.8-asm-primitives.patch"; sha256 = "1vf8bpl37gbd9dcbassgkq9i0rp24qm3bl6hx9zv325174bn402v"; @@ -67,7 +62,7 @@ stdenv.mkDerivation rec { rm $out/lib/*.a ''; - nativeBuildInputs = [ cmake yasm ]; + nativeBuildInputs = [ cmake nasm ] ++ stdenv.lib.optional numaSupport numactl; meta = with stdenv.lib; { description = "Library for encoding h.265/HEVC video streams"; |