dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #62019 from jlesquembre/x265-30

Browse Source 
x265: 2.9 -> 3.0
This commit is contained in:
Renaud 2019-05-26 17:49:15 +02:00 committed by GitHub
commit c104260b80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/x265/default.nix
View File

@ -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) , debugSupport ? false # Run-time sanity checks (debugging)
, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel , highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
, werrorSupport ? false # Warnings as errors , werrorSupport ? false # Warnings as errors
@ -16,26 +17,20 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "x265-${version}"; name = "x265-${version}";
version = "2.9"; version = "3.0";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://get.videolan.org/x265/x265_${version}.tar.gz" "https://get.videolan.org/x265/x265_${version}.tar.gz"
"ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz" "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz"
]; ];
sha256 = "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb"; sha256 = "0qh65wdpasrspkm1y0dlfa123myax568yi0sas0lmg5b1hkgrff5";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ patches = [
# Fix issue #442 (linking issue on non-x86 platforms) # Fix build on ARM (#406)
# 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)
(fetchpatch { (fetchpatch {
url = "https://bitbucket.org/multicoreware/x265/issues/attachments/406/multicoreware/x265/1527562952.26/406/X265-2.8-asm-primitives.patch"; url = "https://bitbucket.org/multicoreware/x265/issues/attachments/406/multicoreware/x265/1527562952.26/406/X265-2.8-asm-primitives.patch";
sha256 = "1vf8bpl37gbd9dcbassgkq9i0rp24qm3bl6hx9zv325174bn402v"; sha256 = "1vf8bpl37gbd9dcbassgkq9i0rp24qm3bl6hx9zv325174bn402v";
@ -67,7 +62,7 @@ stdenv.mkDerivation rec {
rm $out/lib/*.a rm $out/lib/*.a
''; '';
nativeBuildInputs = [ cmake yasm ]; nativeBuildInputs = [ cmake nasm ] ++ stdenv.lib.optional numaSupport numactl;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library for encoding h.265/HEVC video streams"; description = "Library for encoding h.265/HEVC video streams";