MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

x265: 1.5 -> 1.6

Browse source 
+ Removed unused x265-hg package
+ Fix missing optionals
+ Fix high bit-depth to allow for all 64bit platforms
This commit is contained in:
codyopel 2015-04-24 06:51:45 -04:00
parent 5fade2b6aa
commit 82472ee628
4 changed files with 55 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
pkgs/development/libraries/x265/default.nix
View file

@ -1,7 +1,56 @@
{ callPackage, ... } @ args:
{ stdenv, fetchurl, cmake, yasm
, debugSupport ? false # Run-time sanity checks (debugging)
, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
, werrorSupport ? false # Warnings as errors
, ppaSupport ? false # PPA profiling instrumentation
, vtuneSupport ? false # Vtune profiling instrumentation
, custatsSupport ? false # Internal profiling of encoder work
, cliSupport ? true # Build standalone CLI application
, unittestsSupport ? false # Unit tests
}:
callPackage ./generic.nix (args // {
version = "1.5";
rev = "9f0324125f53a12f766f6ed6f98f16e2f42337f4";
sha256 = "1nyim0l975faj7926s4wba8yvjy4rvx005zb7krv0gb5p84nzgi7";
})
let
mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
inherit (stdenv) is64bit;
in
stdenv.mkDerivation rec {
name = "x265-${version}";
version = "1.6";
src = fetchurl {
url = "https://github.com/videolan/x265/archive/${version}.tar.gz";
sha256 = "17c1phwmgcvvh9bakh1249rj2js77nr7y9igg34i3f8hsrdc4x0w";
};
patchPhase = ''
sed -i 's/unknown/${version}/g' source/cmake/version.cmake
'';
cmakeFlags = [
(mkFlag debugSupport "CHECKED_BUILD")
"-DSTATIC_LINK_CRT=OFF"
(mkFlag (highbitdepthSupport && is64bit) "HIGH_BIT_DEPTH")
(mkFlag werrorSupport "WARNINGS_AS_ERRORS")
(mkFlag ppaSupport "ENABLE_PPA")
(mkFlag vtuneSupport "ENABLE_VTUNE")
(mkFlag custatsSupport "DETAILED_CU_STATS")
"-DENABLE_SHARED=ON"
(mkFlag cliSupport "ENABLE_CLI")
(mkFlag unittestsSupport "ENABLE_TESTS")
];
preConfigure = ''
cd source
'';
nativeBuildInputs = [ cmake yasm ];
meta = with stdenv.lib; {
description = "Library for encoding h.265/HEVC video streams";
homepage = http://x265.org;
license = licenses.gpl2;
maintainers = with maintainers; [ codyopel ];
platforms = platforms.all;
};
}

56
pkgs/development/libraries/x265/generic.nix
View file

@ -1,56 +0,0 @@
{ stdenv, fetchhg, cmake, yasm
, rev , sha256, version
, debugSupport ? false # Run-time sanity checks (debugging)
, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
, werrorSupport ? false # Warnings as errors
, ppaSupport ? false # PPA profiling instrumentation
, vtuneSupport ? false # Vtune profiling instrumentation
, custatsSupport ? false # Internal profiling of encoder work
, cliSupport ? true # Build standalone CLI application
, unittestsSupport ? false # Unit tests
, ...
}:
let
mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "x265-${version}";
src = fetchhg {
url = "https://bitbucket.org/multicoreware/x265/src";
inherit rev;
inherit sha256;
};
patchPhase = ''
sed -i 's/unknown/${version}/g' source/cmake/version.cmake
'';
cmakeFlags = with stdenv.lib; [
(mkFlag debugSupport "CHECKED_BUILD")
"-DSTATIC_LINK_CRT=OFF"
(mkFlag (highbitdepthSupport && stdenv.isx86_64) "HIGH_BIT_DEPTH")
(mkFlag werrorSupport "WARNINGS_AS_ERRORS")
(mkFlag ppaSupport "ENABLE_PPA")
"-DENABLE_SHARED=ON"
(mkFlag cliSupport "ENABLE_CLI")
(mkFlag unittestsSupport "ENABLE_TESTS")
];
preConfigure = ''
cd source
'';
nativeBuildInputs = [ cmake yasm ];
meta = {
description = "Library for encoding h.265/HEVC video streams";
homepage = http://x265.org;
license = licenses.gpl2;
maintainers = with maintainers; [ codyopel ];
platforms = platforms.all;
};
}

7
pkgs/development/libraries/x265/hg.nix
View file

@ -1,7 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2015-2-11"; # Date of commit used Y-M-D
rev = "9ab104096834f51bd799ea1cf1160092f8182944";
sha256 = "1j4k6ylglrzng5rz29qx2z06amdrq8wyzvqhm4ivfzvpndfniim6";
})

2
pkgs/top-level/all-packages.nix
View file

@ -7838,8 +7838,6 @@ let
x265 = callPackage ../development/libraries/x265 { };
x265-hg = callPackage ../development/libraries/x265/hg.nix { };
xapian = callPackage ../development/libraries/xapian { };
xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python