Skip to content

x265: 3.2 -> 3.4 #98091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FRidh merged 1 commit into from
Oct 6, 2020
Merged

x265: 3.2 -> 3.4 #98091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions pkgs/development/libraries/x265/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 = [
Expand All @@ -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 = [
Expand Down