pyrox.dev
lol
Merge pull request #6324 from codyopel/x265br
X265br
+3
-3
pkgs/development/libraries/x265/default.nix
+3
-3
pkgs/development/libraries/x265/default.nix
···
1
1
{ callPackage, ... } @ args:
2
2
3
3
callPackage ./generic.nix (args // {
4
-
version = "1.4";
5
-
rev = "5e604833c5aa605d0b6efbe5234492b5e7d8ac61";
6
-
sha256 = "1aqksqi1qmjpva5cal6j7h0hzk298wk3nhqv73wnyqdchq2sa8v5";
4
+
version = "1.5";
5
+
rev = "9f0324125f53a12f766f6ed6f98f16e2f42337f4";
6
+
sha256 = "1nyim0l975faj7926s4wba8yvjy4rvx005zb7krv0gb5p84nzgi7";
7
7
})
+32
-34
pkgs/development/libraries/x265/generic.nix
+32
-34
pkgs/development/libraries/x265/generic.nix
···
1
-
{ stdenv, cmake, fetchhg, mercurial, yasm
1
+
{ stdenv, fetchhg, cmake, yasm
2
2
, rev , sha256, version
3
-
, highBitDepth ? false
4
-
, debuggingSupport ? false
5
-
, enableCli ? true
6
-
, testSupport ? false
3
+
, debugSupport ? false # Run-time sanity checks (debugging)
4
+
, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
5
+
, werrorSupport ? false # Warnings as errors
6
+
, ppaSupport ? false # PPA profiling instrumentation
7
+
, vtuneSupport ? false # Vtune profiling instrumentation
8
+
, custatsSupport ? false # Internal profiling of encoder work
9
+
, cliSupport ? true # Build standalone CLI application
10
+
, unittestsSupport ? false # Unit tests
7
11
, ...
8
12
}:
9
13
14
+
let
15
+
mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
16
+
in
17
+
18
+
with stdenv.lib;
10
19
stdenv.mkDerivation rec {
11
20
name = "x265-${version}";
12
21
···
20
29
sed -i 's/unknown/${version}/g' source/cmake/version.cmake
21
30
'';
22
31
23
-
cmakeFlags = with stdenv.lib;
24
-
''
25
-
${if debuggingSupport
26
-
then "-DCHECKED_BUILD=ON"
27
-
else "-DCHECKED_BUILD=OFF"
28
-
}
29
-
-DSTATIC_LINK_CRT=OFF
30
-
${if (stdenv.system == "x86_64-linux" && highBitDepth)
31
-
then "-DHIGH_BIT_DEPTH=ON"
32
-
else "-DHIGH_BIT_DEPTH=OFF"
33
-
}
34
-
-DWARNINGS_AS_ERRORS=OFF
35
-
-DENABLE_PPA=OFF
36
-
-DENABLE_SHARED=ON
37
-
${if enableCli
38
-
then "-DENABLE_CLI=ON"
39
-
else "-DENABLE_CLI=OFF"
40
-
}
41
-
${if testSupport
42
-
then "-DENABLE_TESTS=ON"
43
-
else "-DENABLE_TESTS=OFF"
44
-
}
45
-
'';
32
+
cmakeFlags = with stdenv.lib; [
33
+
(mkFlag debugSupport "CHECKED_BUILD")
34
+
"-DSTATIC_LINK_CRT=OFF"
35
+
(mkFlag (highbitdepthSupport && stdenv.isx86_64) "HIGH_BIT_DEPTH")
36
+
(mkFlag werrorSupport "WARNINGS_AS_ERRORS")
37
+
(mkFlag ppaSupport "ENABLE_PPA")
38
+
"-DENABLE_SHARED=ON"
39
+
(mkFlag cliSupport "ENABLE_CLI")
40
+
(mkFlag unittestsSupport "ENABLE_TESTS")
41
+
];
46
42
47
-
preConfigure = "cd source";
43
+
preConfigure = ''
44
+
cd source
45
+
'';
48
46
49
-
buildInputs = [ cmake yasm ];
47
+
nativeBuildInputs = [ cmake yasm ];
50
48
51
-
meta = with stdenv.lib; {
52
-
homepage = "http://x265.org";
49
+
meta = {
53
50
description = "Library for encoding h.265/HEVC video streams";
54
-
license = licenses.gpl2;
55
-
platforms = platforms.linux;
51
+
homepage = http://x265.org;
52
+
license = licenses.gpl2;
56
53
maintainers = with maintainers; [ codyopel ];
54
+
platforms = platforms.all;
57
55
};
58
56
}
+3
-3
pkgs/development/libraries/x265/hg.nix
+3
-3
pkgs/development/libraries/x265/hg.nix
···
1
1
{ callPackage, ... } @ args:
2
2
3
3
callPackage ./generic.nix (args // rec {
4
-
version = "hg";
5
-
rev = "5f9f7194267b76f733e9ffb0f9e8b474dfe89a71";
6
-
sha256 = "056ng8nsadmjf6s7igbgbxmiapjcxpfy6pbayl764xbhpkv4md88";
4
+
version = "2015-2-11"; # Date of commit used Y-M-D
5
+
rev = "9ab104096834f51bd799ea1cf1160092f8182944";
6
+
sha256 = "1j4k6ylglrzng5rz29qx2z06amdrq8wyzvqhm4ivfzvpndfniim6";
7
7
})