From 5783082382a7ccf62d276b67084803b3b2dcda58 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Wed, 5 Jun 2024 21:49:17 +0200 Subject: libva-vdpau-driver: rename from vaapiVdpau --- .../libraries/libva-vdpau-driver/default.nix | 40 ++++++++++++++++++++++ pkgs/development/libraries/vaapi-vdpau/default.nix | 40 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 pkgs/development/libraries/libva-vdpau-driver/default.nix delete mode 100644 pkgs/development/libraries/vaapi-vdpau/default.nix diff --git a/pkgs/development/libraries/libva-vdpau-driver/default.nix b/pkgs/development/libraries/libva-vdpau-driver/default.nix new file mode 100644 index 0000000000000..2e3976e3a4d23 --- /dev/null +++ b/pkgs/development/libraries/libva-vdpau-driver/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }: + +stdenv.mkDerivation rec { + pname = "libva-vdpau-driver"; + version = "0.7.4"; + + src = fetchurl { + url = "https://www.freedesktop.org/software/vaapi/releases/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; + }; + + patches = [ + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-glext-85.patch"; + sha256 = "0f0v7cl7kna3jcfnxw48b9mfl0hpacw72df9vym96sa2206vqlb0"; }) + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-drop-h264-api.patch"; + sha256 = "0q5w83jbf4qqmhwf54h906pzxgvhqv7g2vrkw7jzgnrxhhj9sj60"; }) + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-fix_type.patch"; + sha256 = "0s5dk6aa4sm0iyicnf2fwfsrqbvr58nbp77mhjg5bvwlar7znqv7"; }) + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/sigfpe-crash.patch"; + sha256 = "15snqf60ib0xb3cnav5b2r55qv8lv2fa4p6jwxajh8wbvqpw0ibz"; }) + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/implement-vaquerysurfaceattributes.patch"; + sha256 = "1dapx3bqqblw6l2iqqw1yff6qifam8q4m2rq343kwb3dqhy2ymy5"; }) + (fetchpatch { url = "https://github.com/gentoo/gentoo/raw/34d5cc6fcf1d76c1c2833cb534717246c221214c/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch"; + sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; }) + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libvdpau libGLU libGL libva ]; + + postPatch = '' + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = with lib; { + homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver"; + license = licenses.gpl2Plus; + description = "VDPAU driver for the VAAPI library"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix deleted file mode 100644 index 2e3976e3a4d23..0000000000000 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libva-vdpau-driver"; - version = "0.7.4"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/vaapi/releases/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; - }; - - patches = [ - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-glext-85.patch"; - sha256 = "0f0v7cl7kna3jcfnxw48b9mfl0hpacw72df9vym96sa2206vqlb0"; }) - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-drop-h264-api.patch"; - sha256 = "0q5w83jbf4qqmhwf54h906pzxgvhqv7g2vrkw7jzgnrxhhj9sj60"; }) - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-fix_type.patch"; - sha256 = "0s5dk6aa4sm0iyicnf2fwfsrqbvr58nbp77mhjg5bvwlar7znqv7"; }) - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/sigfpe-crash.patch"; - sha256 = "15snqf60ib0xb3cnav5b2r55qv8lv2fa4p6jwxajh8wbvqpw0ibz"; }) - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/implement-vaquerysurfaceattributes.patch"; - sha256 = "1dapx3bqqblw6l2iqqw1yff6qifam8q4m2rq343kwb3dqhy2ymy5"; }) - (fetchpatch { url = "https://github.com/gentoo/gentoo/raw/34d5cc6fcf1d76c1c2833cb534717246c221214c/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch"; - sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libvdpau libGLU libGL libva ]; - - postPatch = '' - sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure - ''; - - meta = with lib; { - homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver"; - license = licenses.gpl2Plus; - description = "VDPAU driver for the VAAPI library"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 104b13076b4c0..8065f2b5f6013 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1333,6 +1333,7 @@ mapAliases ({ v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 + vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05 vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 ventoy-bin = ventoy; # Added 2023-04-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad8d6d20c1c1..4a5ea73ead350 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20519,8 +20519,8 @@ with pkgs; intel-media-driver intel-vaapi-driver mesa + libva-vdpau-driver libvdpau-va-gl - vaapiVdpau glxinfo vdpauinfo; }; @@ -24746,7 +24746,7 @@ with pkgs; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; - vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; + libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { }; vale = callPackage ../tools/text/vale { }; -- cgit 1.4.1