Skip to content

Commit

Permalink
Merge pull request #85886 from primeos/libva
Browse files Browse the repository at this point in the history
libva: 2.6.1 -> 2.7.1
  • Loading branch information
worldofpeace committed Apr 25, 2020
2 parents d3f8f69 + 74ac6ff commit 7280b5e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 11 deletions.
15 changes: 10 additions & 5 deletions pkgs/development/libraries/libva-utils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ stdenv.mkDerivation rec {
inherit (libva) version;

src = fetchFromGitHub {
owner = "01org";
owner = "intel";
repo = "libva-utils";
rev = version;
sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik";
sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9";
};

nativeBuildInputs = [ meson ninja pkgconfig ];
Expand All @@ -26,10 +26,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "VAAPI tools: Video Acceleration API";
homepage = "http://www.freedesktop.org/wiki/Software/vaapi";
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; [ ];
maintainers = with maintainers; [ primeos ];
platforms = platforms.unix;
};
}
19 changes: 13 additions & 6 deletions pkgs/development/libraries/libva/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

stdenv.mkDerivation rec {
name = "libva-${lib.optionalString minimal "minimal-"}${version}";
version = "2.6.1";
version = "2.7.1"; # Also update the hash for libva-utils!

# update libva-utils and vaapiIntel as well
src = fetchFromGitHub {
owner = "01org";
owner = "intel";
repo = "libva";
rev = version;
sha256 = "1x34kf38p5rf52bf54ljr9f7knnbilm7kbszqnfk3lzsqrfc7r2g";
sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq";
};

outputs = [ "dev" "out" ];
Expand All @@ -38,10 +38,17 @@ stdenv.mkDerivation rec {
];

meta = with stdenv.lib; {
description = "VAAPI library: Video Acceleration API";
homepage = "http://www.freedesktop.org/wiki/Software/vaapi";
description = "An implementation for VA-API (Video Acceleration API)";
longDescription = ''
VA-API is an open-source library and API specification, which provides
access to graphics hardware acceleration capabilities for video
processing. It consists of a main library (this package) and
driver-specific acceleration backends for each supported hardware vendor.
'';
homepage = "https://01.org/linuxmedia/vaapi";
changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ primeos ];
platforms = platforms.unix;
};
}

0 comments on commit 7280b5e

Please sign in to comment.