public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50362 from c0bw3b/pkg/x265

Browse Source 
x265: 2.7 -> 2.9
This commit is contained in:
Renaud 2018-11-15 22:27:36 +01:00 committed by GitHub
commit b82a493823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, yasm { stdenv, fetchurl, fetchpatch, cmake, yasm
, 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,19 +16,28 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "x265-${version}"; name = "x265-${version}";
version = "2.7"; version = "2.9";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"http://get.videolan.org/x265/x265_${version}.tar.gz" "https://get.videolan.org/x265/x265_${version}.tar.gz"
"https://github.com/videolan/x265/archive/${version}.tar.gz" "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz"
]; ];
sha256 = "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym"; sha256 = "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
patchPhase = '' 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";
})
];
postPatch = ''
sed -i 's/unknown/${version}/g' source/cmake/version.cmake sed -i 's/unknown/${version}/g' source/cmake/version.cmake
''; '';