From 59b66edba7e5cfd62eea5d01c95cf10a7a764762 Mon Sep 17 00:00:00 2001 From: polygon Date: Thu, 10 Jun 2021 00:36:36 +0200 Subject: [PATCH 1/4] mlt: Add option to build python bindings Python bindings are required for flowblade package Also updated licenses according to copying information --- pkgs/development/libraries/mlt/default.nix | 19 ++++++++++++++----- pkgs/top-level/python-packages.nix | 5 +++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 021dc1c3d95f..26c624668a59 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -2,6 +2,7 @@ , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 +, swig, which, ncurses, enablePython ? false, python }: stdenv.mkDerivation rec { @@ -17,17 +18,20 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkg-config sox libexif gtk2 fftw libebur128 - opencv4 SDL2 - ]; + movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 + ] ++ lib.optional enablePython ncurses; + + nativeBuildInputs = [ pkg-config makeWrapper ] + ++ lib.optionals enablePython [ which python swig ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ "--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl" - ]; + ] ++ lib.optional enablePython "--swig-languages=python"; enableParallelBuilding = true; + outPythonPath = lib.optionalString enablePython "$(toPythonPath $out)"; postInstall = '' wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 @@ -36,6 +40,11 @@ stdenv.mkDerivation rec { s=${movit.dev}/include t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" + '' + lib.optionalString enablePython '' + mkdir -p ${outPythonPath}/mlt + cp -a src/swig/python/_mlt.so ${outPythonPath}/mlt/ + cp -a src/swig/python/mlt.py ${outPythonPath}/mlt/__init__.py + sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g" ''; passthru.updateScript = genericUpdater { @@ -47,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org"; - license = licenses.gpl3; + license = with licenses; [ gpl3Only gpl2Only lgpl21Only ]; maintainers = with maintainers; [ tohl peti ]; platforms = platforms.linux; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1839e598a155..3758b2cac967 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4373,6 +4373,11 @@ in { mlxtend = callPackage ../development/python-modules/mlxtend { }; + mlt = toPythonModule (pkgs.mlt.override { + inherit python; + enablePython = true; + }); + mmh3 = callPackage ../development/python-modules/mmh3 { }; mmpython = callPackage ../development/python-modules/mmpython { }; From 2ec8590e1957f7c588ab40309af199793b7d10b7 Mon Sep 17 00:00:00 2001 From: polygon Date: Sun, 13 Jun 2021 13:43:11 +0200 Subject: [PATCH 2/4] mlt: Add jackrack and ladspa support --- pkgs/development/libraries/mlt/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 26c624668a59..8bd2bc80362c 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -2,7 +2,8 @@ , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 -, swig, which, ncurses, enablePython ? false, python +, jack2, ladspa-sdk, swig, which, ncurses +, enablePython ? false, python }: stdenv.mkDerivation rec { @@ -17,12 +18,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 + SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev + movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2 + ladspa-sdk ] ++ lib.optional enablePython ncurses; - nativeBuildInputs = [ pkg-config makeWrapper ] - ++ lib.optionals enablePython [ which python swig ]; + nativeBuildInputs = [ pkg-config makeWrapper which ] + ++ lib.optionals enablePython [ python swig ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine From f2c26dd81080180981b02eb77f78517054eda2b2 Mon Sep 17 00:00:00 2001 From: polygon Date: Tue, 15 Jun 2021 12:09:44 +0200 Subject: [PATCH 3/4] maintainers: add polygon --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b1f97ceeec31..45022082ad3d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8187,6 +8187,12 @@ githubId = 1829032; name = "Paul Hendry"; }; + polygon = { + email = "polygon@wh2.tu-dresden.de"; + name = "Polygon"; + github = "polygon"; + githubId = 51489; + }; polyrod = { email = "dc1mdp@gmail.com"; github = "polyrod"; From d68139154c0855636d4c1d553f382c1b4f7648ad Mon Sep 17 00:00:00 2001 From: polygon Date: Fri, 11 Jun 2021 09:53:34 +0200 Subject: [PATCH 4/4] flowblade: init at 2.8.0.3 --- pkgs/applications/video/flowblade/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/video/flowblade/default.nix diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix new file mode 100644 index 000000000000..2e50dfa12185 --- /dev/null +++ b/pkgs/applications/video/flowblade/default.nix @@ -0,0 +1,45 @@ +{ lib, fetchFromGitHub, stdenv +, ffmpeg, frei0r, sox, gtk3, python3, ladspaPlugins +, gobject-introspection, makeWrapper, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "flowblade"; + version = "2.8.0.3"; + + src = fetchFromGitHub { + owner = "jliljebl"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/EkI3qiceB5eKTVQnpG+z4e6yaE9hDtn6I+iN/J+h/g="; + }; + + buildInputs = [ + ffmpeg frei0r sox gtk3 gobject-introspection ladspaPlugins + (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow ])) + ]; + + nativeBuildInputs = [ gobject-introspection makeWrapper wrapGAppsHook ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -a ${src}/flowblade-trunk $out/flowblade + + makeWrapper $out/flowblade/flowblade $out/bin/flowblade \ + --set FREI0R_PATH ${frei0r}/lib/frei0r-1 \ + --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa \ + ''${gappsWrapperArgs[@]} + + runHook postInstall + ''; + + meta = with lib; { + description = "Multitrack Non-Linear Video Editor"; + homepage = "https://jliljebl.github.io/flowblade/"; + license = with licenses; [ gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ polygon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9751bf941624..4f80996a257e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4779,6 +4779,8 @@ in flips = callPackage ../tools/compression/flips { }; + flowblade = callPackage ../applications/video/flowblade { }; + fmbt = callPackage ../development/tools/fmbt { python = python2; };