diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-06-26 14:35:36 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-06-26 15:11:22 +0200 |
commit | 5efbf76d616bbf27cdb2fbe9992afdf299329f93 (patch) | |
tree | 0afaf76beaac4342003ad1a58f1e3976f91a49c6 /pkgs/development/libraries/libva | |
parent | fe9a096f469b5ec5582c50f183f810a02e97d410 (diff) |
libva: 2.7.1 -> 2.8.0
Diffstat (limited to 'pkgs/development/libraries/libva')
-rw-r--r-- | pkgs/development/libraries/libva/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/libva/utils.nix | 32 |
2 files changed, 34 insertions, 15 deletions
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index d0bd2ecc009b8..7f690f0997b02 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -7,29 +7,16 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.7.1"; # Also update the hash for libva-utils! + version = "2.8.0"; # Also update the hash for libva-utils! # update libva-utils and vaapiIntel as well src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq"; + sha256 = "190cq173jzp5rkrczi8gzbwa0y3xk253v4wd205a5ilfngm7srns"; }; - patches = [ - (fetchpatch { # meson: Allow for libdir and includedir to be absolute paths - url = "https://github.com/intel/libva/commit/de902e2905abff635f3bb151718cc52caa3f669c.patch"; - sha256 = "1lpc8qzvsxnlsh9g0ab5lja204zxz8rr2p973pfihcw7dcxc3gia"; - }) - ]; - - postPatch = '' - # Remove the execute bit from all source code files - # https://github.com/intel/libva/commit/dbd2cd635f33af1422cbc2079af0a7e68671c102 - chmod -x va/va{,_dec_av1,_trace,_vpp}.h - ''; - outputs = [ "dev" "out" ]; nativeBuildInputs = [ meson pkg-config ninja wayland ]; diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix new file mode 100644 index 0000000000000..5b9f4cdd8aa38 --- /dev/null +++ b/pkgs/development/libraries/libva/utils.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config +, libdrm, libva, libX11, libXext, libXfixes, wayland +}: + +stdenv.mkDerivation rec { + pname = "libva-utils"; + inherit (libva) version; + + src = fetchFromGitHub { + owner = "intel"; + repo = "libva-utils"; + rev = version; + sha256 = "081hw2jnj64bpqwh9p41n5caqzm6dnj1ggnvvc5wrf4m2z1h2bjb"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + + buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ]; + + meta = with stdenv.lib; { + description = "A collection of utilities and examples for VA-API"; + longDescription = '' + libva-utils is a collection of utilities and examples to exercise VA-API + in accordance with the libva project. + ''; + homepage = "https://github.com/intel/libva-utils"; + changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; + license = licenses.mit; + maintainers = with maintainers; [ primeos ]; + platforms = platforms.unix; + }; +} |