From e99522ee4cd44a75dabbf5529188431c2bcb9fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 18 Aug 2022 22:44:35 +0200 Subject: [PATCH 1/4] 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 e8675263720..eaf27ec7886 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"; From 798cc46a6c94d3ad525dab0333378e60dd587d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 18 Aug 2022 22:45:33 +0200 Subject: [PATCH 2/4] vdrPlugins.markad: unstable -> 2.0.4 --- pkgs/applications/video/vdr/plugins.nix | 26 ++++++++++++------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index eaf27ec7886..4e9818456e1 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -49,18 +49,19 @@ in { markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "unstable-2017-03-13"; + version = "2.0.4"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-markad.git"; - sha256 = "0jvy70r8bcmbs7zdqilfz019z5xkz5c6rs57h1dsgv8v6x86c2i4"; - rev = "ea2e182ec798375f3830f8b794e7408576f139ad"; + src = fetchFromGitHub { + repo = "vdr-plugin-markad"; + owner = "jbrundiers"; + sha256 = "sha256-Y4KsEtUq+KoUooXiw9O9RokBxNwWBkiGB31GncmHkYM="; + rev = "288e3dae93421b0176f4f62b68ea4b39d98e8793"; }; buildInputs = [ vdr libav ]; postPatch = '' - substituteInPlace command/Makefile --replace '$(DESTDIR)/usr' '$(DESTDIR)' + substituteInPlace command/Makefile --replace '/usr' "" substituteInPlace plugin/markad.cpp \ --replace "/usr/bin" "$out/bin" \ @@ -70,22 +71,19 @@ in { --replace "/var/lib/markad" "$out/var/lib/markad" ''; - preBuild = '' - mkdir -p $out/lib/vdr - ''; - buildFlags = [ "DESTDIR=$(out)" - "LIBDIR=$(out)/lib/vdr" + "LIBDIR=/lib/vdr" + "APIVERSION=${vdr.version}" "VDRDIR=${vdr.dev}/include/vdr" - "LOCALEDIR=$(DESTDIR)/share/locale" + "LOCDIR=/share/locale" ]; installFlags = buildFlags; meta = with lib; { - homepage = "https://projects.vdr-developer.org/projects/plg-markad"; - description = "Ein Programm zum automatischen Setzen von Schnittmarken bei Werbeeinblendungen während einer Sendung."; + homepage = "https://github.com/jbrundiers/vdr-plugin-markad"; + description = "MarkAd marks advertisements in VDR recordings."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; From 45c07350c7e05ee7c562f0f0197aedf9d2073f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 18 Aug 2022 22:46:44 +0200 Subject: [PATCH 3/4] vdrPlugins.softhddevice: init ad 1.9.0 --- pkgs/applications/video/vdr/plugins.nix | 2 + .../video/vdr/softhddevice/default.nix | 50 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/video/vdr/softhddevice/default.nix diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 4e9818456e1..5e94ed562d2 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -12,6 +12,8 @@ }; in { + softhddevice = callPackage ./softhddevice {}; + xineliboutput = callPackage ./xineliboutput {}; skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: { diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix new file mode 100644 index 00000000000..1b7f4128ca6 --- /dev/null +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, vdr +, alsa-lib +, fetchFromGitHub +, xcbutilwm +, xorgserver +, ffmpeg +, libva +, libvdpau +, xorg +}: +stdenv.mkDerivation rec { + pname = "vdr-softhddevice"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "ua0lnj"; + repo = "vdr-plugin-softhddevice"; + sha256 = "sha256-IqG1Jr+fV4MMyTTOUGY34HNqS8qvAH+CSi2IEyVGVFo="; + rev = "v${version}"; + }; + + buildInputs = [ + vdr + xcbutilwm + ffmpeg + alsa-lib + libva + libvdpau + xorg.libxcb + xorg.libX11 + ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + postPatch = '' + substituteInPlace softhddev.c \ + --replace "LOCALBASE \"/bin/X\"" "\"${xorgserver}/bin/X\"" + ''; + + meta = with lib; { + homepage = "https://github.com/ua0lnj/vdr-plugin-softhddevice"; + description = "VDR SoftHDDevice Plug-in"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + +} From 0a1b21ff95d641c69ac4b1cc17601f6a10da1481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 18 Aug 2022 22:47:08 +0200 Subject: [PATCH 4/4] vdrPlugins.streamdev: init at 0.6.3 --- pkgs/applications/video/vdr/plugins.nix | 2 + .../video/vdr/streamdev/default.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/video/vdr/streamdev/default.nix diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 5e94ed562d2..4211faf3f9d 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -14,6 +14,8 @@ in { softhddevice = callPackage ./softhddevice {}; + streamdev = callPackage ./streamdev {}; + xineliboutput = callPackage ./xineliboutput {}; skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: { diff --git a/pkgs/applications/video/vdr/streamdev/default.nix b/pkgs/applications/video/vdr/streamdev/default.nix new file mode 100644 index 00000000000..6ef00deab09 --- /dev/null +++ b/pkgs/applications/video/vdr/streamdev/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, lib +, vdr +}: +stdenv.mkDerivation rec { + pname = "vdr-streamdev"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "vdr-projects"; + repo = "vdr-plugin-streamdev"; + rev = version; + sha256 = "sha256-12sASyFAnSuP2xQzr1KL/Am52ez6hiOUH/0zFH2bxhc="; + }; + + # configure don't accept argument --prefix + dontAddPrefix = true; + + makeFlags = [ + "DESTDIR=$(out)" + "LIBDIR=/lib/vdr" + "LOCDIR=/share/locale" + ]; + + enableParallelBuilding = true; + + buildInputs = [ + vdr + ]; + + meta = with lib;{ + homepage = "https://github.com/vdr-projects/vdr-plugin-streamdev"; + description = "This PlugIn is a VDR implementation of the VTP (Video Transfer Protocol) Version 0.0.3 (see file PROTOCOL) and a basic HTTP Streaming Protocol."; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + inherit (vdr.meta) platforms; + }; +}