Merge pull request #187345 from ck3d/vdr-plugins

vdrPlugins: update plugins

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
@@ -12,6 +12,10 @@
   };
 in {
 
+  softhddevice = callPackage ./softhddevice {};
+
+  streamdev = callPackage ./streamdev {};
+
   xineliboutput = callPackage ./xineliboutput {};
 
   skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: {
@@ -47,57 +51,21 @@ 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";
+    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" \
@@ -107,22 +75,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" ];

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" ];
+  };
+
+}

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;
+  };
+}