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

Merge pull request #91605 from primeos/libva

Browse Source 
libva: 2.7.1 -> 2.8.0
This commit is contained in:
Michael Weiss 2020-06-28 17:44:31 +02:00 committed by GitHub
commit 8f423d094d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/libva/default.nix
View File

@ -7,29 +7,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libva-${lib.optionalString minimal "minimal-"}${version}"; 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 # update libva-utils and vaapiIntel as well
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "libva"; repo = "libva";
rev = version; 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" ]; outputs = [ "dev" "out" ];
nativeBuildInputs = [ meson pkg-config ninja wayland ]; nativeBuildInputs = [ meson pkg-config ninja wayland ];

2
pkgs/development/libraries/libva-utils/default.nix → pkgs/development/libraries/libva/utils.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "intel"; owner = "intel";
repo = "libva-utils"; repo = "libva-utils";
rev = version; rev = version;
sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9"; sha256 = "081hw2jnj64bpqwh9p41n5caqzm6dnj1ggnvvc5wrf4m2z1h2bjb";
}; };
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];

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

@ -13604,7 +13604,7 @@ in
libva = callPackage ../development/libraries/libva { }; libva = callPackage ../development/libraries/libva { };
libva-minimal = libva.override { minimal = true; }; libva-minimal = libva.override { minimal = true; };
libva-utils = callPackage ../development/libraries/libva-utils { }; libva-utils = callPackage ../development/libraries/libva/utils.nix { };
libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; libva1 = callPackage ../development/libraries/libva/1.0.0.nix { };
libva1-minimal = libva1.override { minimal = true; }; libva1-minimal = libva1.override { minimal = true; };