From dc617c662350c026fade3b0561e43314f0a56da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 29 Jul 2023 14:03:56 +0200 Subject: [PATCH 1/3] vdrPlugins.softhddevice: 1.10.3 -> 1.11.1 --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index b0ea1b04c258..1be01e63fc58 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.10.3"; + version = "1.11.1"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-iuQ6ZHPrtIQzEqHYrLibZ8uOOwNqMbWYCD5plDQcBZg="; + sha256 = "sha256-+itSxkyst/KJzyT8ALJkCKumrHHKiWfnvikonwexgnc="; rev = "v${version}"; }; From 5cd25a3eced3a9585ddd861d98dfaccd1db0549d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 29 Jul 2023 14:08:23 +0200 Subject: [PATCH 2/3] vdrPlugins.markad: 3.1.1 -> 3.3.3 --- .../applications/video/vdr/markad/default.nix | 59 +++++++++++++++++++ pkgs/applications/video/vdr/plugins.nix | 52 ++-------------- 2 files changed, 63 insertions(+), 48 deletions(-) create mode 100644 pkgs/applications/video/vdr/markad/default.nix diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix new file mode 100644 index 000000000000..d924398b6389 --- /dev/null +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, vdr +, fetchFromGitHub +, graphicsmagick +, pcre +, xorgserver +, ffmpeg +, libiconv +, boost +, libgcrypt +, perl +, util-linux +, groff +, libva +, xorg +, ncurses +, callPackage +}: +stdenv.mkDerivation rec { + pname = "vdr-markad"; + version = "3.3.3"; + + src = fetchFromGitHub { + repo = "vdr-plugin-markad"; + owner = "kfb77"; + sha256 = "sha256-wU8hfNss0Lxvf9CqFhDAPOxIVaG/9vNR620xpEJkxWI="; + rev = "V${version}"; + }; + + buildInputs = [ vdr ffmpeg ]; + + postPatch = '' + substituteInPlace command/Makefile --replace '/usr' "" + + substituteInPlace plugin/markad.cpp \ + --replace "/usr/bin" "$out/bin" \ + --replace "/var/lib/markad" "$out/var/lib/markad" + + substituteInPlace command/markad-standalone.cpp \ + --replace "/var/lib/markad" "$out/var/lib/markad" + ''; + + buildFlags = [ + "DESTDIR=$(out)" + "VDRDIR=${vdr.dev}/lib/pkgconfig" + ]; + + installFlags = buildFlags; + + meta = with lib; { + inherit (src.meta) homepage; + description = "MarkAd marks advertisements in VDR recordings."; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + inherit (vdr.meta) platforms; + }; + +} diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 404af2ec83b3..ba24cefb4d94 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,6 +1,6 @@ { lib, stdenv, vdr, fetchFromGitHub -, graphicsmagick, pcre, xorgserver, ffmpeg -, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses +, graphicsmagick, pcre +, boost, libgcrypt, perl, util-linux, groff, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { @@ -12,6 +12,8 @@ }; in { + markad = callPackage ./markad {}; + softhddevice = callPackage ./softhddevice {}; streamdev = callPackage ./streamdev {}; @@ -53,52 +55,6 @@ in { }; - markad = stdenv.mkDerivation rec { - pname = "vdr-markad"; - version = "3.1.1"; - - src = fetchFromGitHub { - repo = "vdr-plugin-markad"; - owner = "kfb77"; - sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M="; - rev = "V${version}"; - }; - - buildInputs = [ vdr ffmpeg ]; - - postPatch = '' - substituteInPlace command/Makefile --replace '/usr' "" - - substituteInPlace plugin/markad.cpp \ - --replace "/usr/bin" "$out/bin" \ - --replace "/var/lib/markad" "$out/var/lib/markad" - - substituteInPlace command/markad-standalone.cpp \ - --replace "/var/lib/markad" "$out/var/lib/markad" - ''; - - buildFlags = [ - "DESTDIR=$(out)" - "LIBDIR=/lib/vdr" - "BINDIR=/bin" - "MANDIR=/share/man" - "APIVERSION=${vdr.version}" - "VDRDIR=${vdr.dev}/include/vdr" - "LOCDIR=/share/locale" - ]; - - installFlags = buildFlags; - - meta = with lib; { - inherit (src.meta) homepage; - description = "MarkAd marks advertisements in VDR recordings."; - maintainers = [ maintainers.ck3d ]; - license = licenses.gpl2; - inherit (vdr.meta) platforms; - }; - - }; - epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; version = "2.4.2"; From eca1f7bd56ed4a3760288d5aaf5c1aa54b38a53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 29 Jul 2023 14:10:41 +0200 Subject: [PATCH 3/3] vdrPlugins.nopacity: initial 1.1.14 --- .../applications/video/vdr/markad/default.nix | 2 +- .../video/vdr/nopacity/default.nix | 24 +++++++++++++++++++ pkgs/applications/video/vdr/plugins.nix | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/video/vdr/nopacity/default.nix diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index d924398b6389..3ced362b946d 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; - description = "MarkAd marks advertisements in VDR recordings."; + description = "Plugin for VDR that marks advertisements"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; inherit (vdr.meta) platforms; diff --git a/pkgs/applications/video/vdr/nopacity/default.nix b/pkgs/applications/video/vdr/nopacity/default.nix new file mode 100644 index 000000000000..b46723fbf848 --- /dev/null +++ b/pkgs/applications/video/vdr/nopacity/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }: +stdenv.mkDerivation rec { + pname = "vdr-skin-nopacity"; + version = "1.1.14"; + + src = fetchFromGitLab { + repo = "SkinNopacity"; + owner = "kamel5"; + sha256 = "sha256-zSAnjBkFR8m+LXeoYO163VkNtVpfQZR5fI5CEzUABdQ="; + rev = version; + }; + + buildInputs = [ vdr graphicsmagick ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "Highly customizable native true color skin for the Video Disc Recorder"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + inherit (vdr.meta) platforms; + }; +} diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index ba24cefb4d94..92d9128543f0 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -14,6 +14,8 @@ in { markad = callPackage ./markad {}; + nopacity = callPackage ./nopacity {}; + softhddevice = callPackage ./softhddevice {}; streamdev = callPackage ./streamdev {};