From e99522ee4cd44a75dabbf5529188431c2bcb9fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de> Date: Thu, 18 Aug 2022 22:44:35 +0200 Subject: [PATCH] vdrPlugins.vaapidevice: Remove broken plugin The plugin is not compatible with ffmpeg. --- pkgs/applications/video/vdr/plugins.nix | 41 ++----------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index e8675263720c..eaf27ec78862 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub -, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg +{ lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub +, graphicsmagick, libav, pcre, xorgserver, ffmpeg , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let @@ -47,43 +47,6 @@ in { }; - vaapidevice = stdenv.mkDerivation { - pname = "vdr-vaapidevice"; - version = "20190525"; - - buildInputs = [ - vdr libxcb xcbutilwm ffmpeg - alsa-lib - libvdpau # vdpau - libva # va-api - ] ++ (with xorg; [ libxcb libX11 ]); - - makeFlags = [ "DESTDIR=$(out)" ]; - - postPatch = '' - substituteInPlace vaapidev.c --replace /usr/bin/X ${xorgserver}/bin/X - # https://github.com/rofafor/vdr-plugin-vaapidevice/issues/5 - substituteInPlace Makefile --replace libva libva-x11 - ''; - - src = fetchFromGitHub { - owner = "pesintta"; - repo = "vdr-plugin-vaapidevice"; - sha256 = "1gwjp15kjki9x5742fhaqk3yc2bbma74yp2vpn6wk6kj46nbnwp6"; - rev = "d19657bae399e79df107e316ca40922d21393f80"; - }; - - meta = with lib; { - homepage = "https://github.com/pesintta/vdr-plugin-vaapidevice"; - description = "VDR SoftHDDevice Plug-in (with VA-API VPP additions)"; - maintainers = [ maintainers.ck3d ]; - license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; - - }; - - markad = stdenv.mkDerivation rec { pname = "vdr-markad"; version = "unstable-2017-03-13";