Merge pull request #115121 from mitchmindtree/ardour-video

ardour: add a videoSupport option, harvid: init at 0.8.3, xjadeo: init at 0.8.10

authored by

Sandro and committed by
GitHub
8fe24560 83a19ff8

+112 -3
+6
maintainers/maintainer-list.nix
··· 6325 6325 githubId = 1776903; 6326 6326 name = "Andrew Abbott"; 6327 6327 }; 6328 + mitchmindtree = { 6329 + email = "mail@mitchellnordine.com"; 6330 + github = "mitchmindtree"; 6331 + githubId = 4587373; 6332 + name = "Mitchell Nordine"; 6333 + }; 6328 6334 mjanczyk = { 6329 6335 email = "m@dragonvr.pl"; 6330 6336 github = "mjanczyk";
+12 -3
pkgs/applications/audio/ardour/default.nix
··· 16 16 , glibmm 17 17 , graphviz 18 18 , gtkmm2 19 + , harvid 19 20 , itstool 20 21 , libarchive 21 22 , libjack2 ··· 35 36 , lilv 36 37 , lrdf 37 38 , lv2 39 + , makeWrapper 38 40 , pango 39 41 , perl 40 42 , pkg-config ··· 49 51 , taglib 50 52 , vamp-plugin-sdk 51 53 , wafHook 54 + , xjadeo 55 + , videoSupport ? false 52 56 }: 53 57 stdenv.mkDerivation rec { 54 58 pname = "ardour"; ··· 70 74 doxygen 71 75 graphviz # for dot 72 76 itstool 77 + makeWrapper 73 78 perl 74 79 pkg-config 75 80 python3 ··· 121 126 suil 122 127 taglib 123 128 vamp-plugin-sdk 124 - ]; 129 + ] ++ lib.optionals videoSupport [ harvid xjadeo ]; 125 130 126 131 wafConfigureFlags = [ 127 132 "--cxx11" ··· 158 163 "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour6.png" 159 164 done 160 165 install -vDm 644 "ardour.1"* -t "$out/share/man/man1" 166 + '' + lib.optionalString videoSupport '' 167 + # `harvid` and `xjadeo` must be accessible in `PATH` for video to work. 168 + wrapProgram "$out/bin/ardour6" \ 169 + --prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}" 161 170 ''; 162 171 163 172 LINKFLAGS = "-lpthread"; ··· 174 183 https://community.ardour.org/donate 175 184 ''; 176 185 homepage = "https://ardour.org/"; 177 - license = licenses.gpl2; 186 + license = licenses.gpl2Plus; 178 187 platforms = platforms.linux; 179 - maintainers = with maintainers; [ goibhniu magnetophon ]; 188 + maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ]; 180 189 }; 181 190 }
+42
pkgs/tools/video/harvid/default.nix
··· 1 + { lib, stdenv, fetchFromGitHub, ffmpeg, libjpeg, libpng, pkg-config }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "harvid"; 5 + version = "0.8.3"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "x42"; 9 + repo = "harvid"; 10 + rev = "v${version}"; 11 + sha256 = "0l1plfsfh2ixhlzg3hqqvjj42z7g422718a9kgbh7b4p882n71x7"; 12 + }; 13 + 14 + nativeBuildInputs = [ pkg-config ]; 15 + 16 + buildInputs = [ ffmpeg libjpeg libpng ]; 17 + 18 + makeFlags = [ "DESTDIR=$(out)" "libdir=\"/lib\"" ]; 19 + 20 + postInstall = '' 21 + mkdir -p $out/bin 22 + mv $out/usr/local/bin/* $out/bin 23 + mv $out/usr/local/share $out/ 24 + rm -r $out/usr 25 + ''; 26 + 27 + meta = with lib; { 28 + description = 29 + "Decodes still images from movie files and serves them via HTTP"; 30 + longDescription = '' 31 + harvid's intended use-case is to efficiently provide frame-accurate data 32 + and act as second level cache for rendering the video-timeline in Ardour, 33 + but it is not limited to that: it has applications for any task that 34 + requires a high-performance frame-accurate online image extraction 35 + processor. 36 + ''; 37 + homepage = "http://x42.github.io/harvid"; 38 + license = licenses.gpl2Plus; 39 + platforms = platforms.linux; 40 + maintainers = with maintainers; [ mitchmindtree ]; 41 + }; 42 + }
+48
pkgs/tools/video/xjadeo/default.nix
··· 1 + { lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg, freetype, libGLU 2 + , libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }: 3 + 4 + stdenv.mkDerivation rec { 5 + pname = "xjadeo"; 6 + version = "0.8.10"; 7 + 8 + src = fetchFromGitHub { 9 + owner = "x42"; 10 + repo = "xjadeo"; 11 + rev = "v${version}"; 12 + sha256 = "0dma4cjgbrpy16x63zvfr0xss4lryl0zw7nvixvhq2f6z8day1ds"; 13 + }; 14 + 15 + nativeBuildInputs = [ autoreconfHook pkg-config ]; 16 + 17 + buildInputs = [ 18 + ffmpeg 19 + libjack2 20 + libX11 21 + xorg.libXext 22 + xorg.libXpm 23 + # The following are recommended in the README, but are seemingly 24 + # unnecessary for a successful build. That said, the result of including 25 + # these in the build process is possibly required at runtime in some cases, 26 + # but I've not the time to test thoroughly for these cases. Should 27 + # consider investigating and splitting these into options in the future. 28 + freetype 29 + libGLU 30 + liblo 31 + libXv 32 + portmidi 33 + ]; 34 + 35 + meta = with lib; { 36 + description = "The X Jack Video Monitor"; 37 + longDescription = '' 38 + Xjadeo is a software video player that displays a video-clip in sync with 39 + an external time source (MTC, LTC, JACK-transport). Xjadeo is useful in 40 + soundtrack composition, video monitoring or any task that requires to 41 + synchronizing movie frames with external events. 42 + ''; 43 + homepage = "http://xjadeo.sourceforge.net"; 44 + license = licenses.gpl2Plus; 45 + platforms = platforms.linux; 46 + maintainers = with maintainers; [ mitchmindtree ]; 47 + }; 48 + }
+4
pkgs/top-level/all-packages.nix
··· 1381 1381 1382 1382 hakrawler = callPackage ../tools/security/hakrawler { }; 1383 1383 1384 + harvid = callPackage ../tools/video/harvid { }; 1385 + 1384 1386 hime = callPackage ../tools/inputmethods/hime {}; 1385 1387 1386 1388 hinit = haskell.lib.justStaticExecutables haskellPackages.hinit; ··· 1426 1428 }; 1427 1429 1428 1430 passExtensions = recurseIntoAttrs pass.extensions; 1431 + 1432 + xjadeo = callPackage ../tools/video/xjadeo { }; 1429 1433 1430 1434 asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; 1431 1435