From f476db5bddfeaec35a84c967fa27cf9367198716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Mar 2022 18:21:03 +0100 Subject: [PATCH 1/4] libva1: 1.7.3 -> 1.8.3, update homepage, add SuperSandro2000 as maintainer All things under bin moved to libva-utils. Changelog: https://github.com/intel/libva/compare/libva-1.7.3...libva-1.8.3#diff-7ee66c4f1536ac84dc5bbff1b8312e2eef24b974b3e48a5c5c2bcfdf2eb8f3ce --- pkgs/development/libraries/libva/1.0.0.nix | 37 ---------------- pkgs/development/libraries/libva/1.nix | 50 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 51 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/libraries/libva/1.0.0.nix create mode 100644 pkgs/development/libraries/libva/1.nix diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix deleted file mode 100644 index ade56ac16ee9..000000000000 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchurl, libX11, pkg-config, libXext, libdrm, libXfixes, wayland, libffi -, libGL, mesa -, minimal ? false, libva1-minimal -}: - -stdenv.mkDerivation rec { - pname = "libva"; - version = "1.7.3"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2"; - sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; - }; - - outputs = [ "bin" "dev" "out" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; - # TODO: share libs between minimal and !minimal - perhaps just symlink them - - configureFlags = - # Add FHS paths for non-NixOS applications. - [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ - lib.optionals (!minimal) [ "--enable-glx" ]; - - installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; - - meta = with lib; { - homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; - license = licenses.mit; - description = "VAAPI library: Video Acceleration API"; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix new file mode 100644 index 000000000000..5197420783a1 --- /dev/null +++ b/pkgs/development/libraries/libva/1.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, libX11 +, pkg-config +, libXext +, libdrm +, libXfixes +, wayland +, libffi +, libGL +, mesa +, minimal ? false +, libva1-minimal +}: + +stdenv.mkDerivation rec { + pname = "libva" + lib.optionalString minimal "-minimal"; + version = "1.8.3"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "libva"; + rev = version; + sha256 = "sha256-ur59cqdZqXIY2dDUSie9XsxyRomVBxIW2IVKAgWYC38="; + }; + + outputs = [ "dev" "out" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libdrm ] + ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; + # TODO: share libs between minimal and !minimal - perhaps just symlink them + + # Add FHS paths for non-NixOS applications. + configureFlags = [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] + ++ lib.optionals (!minimal) [ "--enable-glx" ]; + + installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; + + meta = with lib; { + homepage = "https://www.freedesktop.org/wiki/Software/vaapi/"; + license = licenses.mit; + description = "VAAPI library: Video Acceleration API"; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fea1b617a7d5..de4761b35ee9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18870,7 +18870,7 @@ with pkgs; libva-minimal = libva.override { minimal = true; }; libva-utils = callPackage ../development/libraries/libva/utils.nix { }; - libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; + libva1 = callPackage ../development/libraries/libva/1.nix { }; libva1-minimal = libva1.override { minimal = true; }; libvarlink = callPackage ../development/libraries/libvarlink { }; From c329f549eb0745abc9a836c10a15e13bc05915a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Mar 2022 19:44:35 +0100 Subject: [PATCH 2/4] libva: add SuperSandro2000 as maintainer, add - before minimal --- pkgs/development/libraries/libva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 4b7420c8e6b6..99c0e3dd7aa8 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - pname = "libva" + lib.optionalString minimal "minimal"; + pname = "libva" + lib.optionalString minimal "-minimal"; version = "2.14.0"; src = fetchFromGitHub { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://01.org/linuxmedia/vaapi"; changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos SuperSandro2000 ]; platforms = platforms.unix; }; } From 9e1ee884e99428cee274892b802792b264bdb184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Mar 2022 19:45:18 +0100 Subject: [PATCH 3/4] libva-utils: add SuperSandro2000 as maintainer --- pkgs/development/libraries/libva/utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index f5538c34acd6..fc1fd00a53ba 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/libva-utils"; changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos SuperSandro2000 ]; platforms = platforms.unix; }; } From f8ca3a9099629c3fc81deb11b1a7fd95e1bb6dce Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 12 Mar 2022 21:51:06 +0100 Subject: [PATCH 4/4] liva{,-utils}: remove primos from maintainers --- pkgs/development/libraries/libva/default.nix | 2 +- pkgs/development/libraries/libva/utils.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 99c0e3dd7aa8..037318353ce0 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://01.org/linuxmedia/vaapi"; changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index fc1fd00a53ba..357d20527957 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/libva-utils"; changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; }; }