diff options
| author | Titouan <hi@titouan.co> | 2020-09-16 11:59:49 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-10-06 10:17:26 +0200 |
| commit | c1a0aa7eb73f86b0224a57671752673befe08953 (patch) | |
| tree | 1970c75f031e041b55e054ada9e7fcc0ac6bff1e /pkgs/development/libraries/x265 | |
| parent | b90105fa1032ca0b78d0276119b3fb0f8e36ce9c (diff) | |
x265: 3.2 -> 3.4
Diffstat (limited to 'pkgs/development/libraries/x265')
| -rw-r--r-- | pkgs/development/libraries/x265/default.nix | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 48ed6cf46802..714e31521ecf 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, nasm, numactl +{ stdenv, fetchFromBitbucket, 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) , werrorSupport ? false # Warnings as errors @@ -23,31 +23,23 @@ let (mkFlag werrorSupport "WARNINGS_AS_ERRORS") ]; - version = "3.2"; + version = "3.4"; - src = fetchurl { - urls = [ - "https://get.videolan.org/x265/x265_${version}.tar.gz" - "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz" - ]; - sha256 = "0fqkhfhr22gzavxn60cpnj3agwdf5afivszxf3haj5k1sny7jk9n"; + src = fetchFromBitbucket { + owner = "multicoreware"; + repo = "x265_git"; + rev = "${version}"; + sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; }; - patches = [ - # 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"; - }) - ]; - buildLib = has12Bit: stdenv.mkDerivation rec { name = "libx265-${if has12Bit then "12" else "10"}-${version}"; - inherit src patches; + inherit src; enableParallelBuilding = true; postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake + sed -i 's/0.0/${version}/g' source/cmake/version.cmake ''; cmakeLibFlags = [ @@ -72,12 +64,13 @@ in stdenv.mkDerivation rec { pname = "x265"; - inherit version src patches; + inherit version src; enableParallelBuilding = true; postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake + sed -i 's/0.0/${version}/g' source/cmake/version.cmake ''; cmakeFlags = [ |