diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-09-27 20:09:54 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-10-02 22:19:16 +0200 |
commit | 3e6ce75b8fc9d8d705e375d655f4609b4784481a (patch) | |
tree | 07cc311cde947488074b6faee588692be64c0ef2 /pkgs/applications/video | |
parent | 400910c1f75d28b283eb4ed42e243bbad4062734 (diff) | |
download | nixlib-3e6ce75b8fc9d8d705e375d655f4609b4784481a.tar nixlib-3e6ce75b8fc9d8d705e375d655f4609b4784481a.tar.gz nixlib-3e6ce75b8fc9d8d705e375d655f4609b4784481a.tar.bz2 nixlib-3e6ce75b8fc9d8d705e375d655f4609b4784481a.tar.lz nixlib-3e6ce75b8fc9d8d705e375d655f4609b4784481a.tar.xz nixlib-3e6ce75b8fc9d8d705e375d655f4609b4784481a.tar.zst nixlib-3e6ce75b8fc9d8d705e375d655f4609b4784481a.zip |
openshot-qt: 2.0.7 -> 2.1.0
Also update libopenshot (0.1.1 -> 0.1.2) and libopenshot-audio (0.1.1 -> 0.1.2). Both libraries seem to be somewhat version coupled with openshot (all three projects had a release at the same time). Openshot now depends on ZMQ. Test notes: the application runs, but I managed to crash it after doing this: * Import pictures and video * Add two pictures to the timeline (next to each other) * Drag the 2nd picture partly over over the first (creates an effect). App dies. The last output from the app is: timeline_webview:INFO addTransition... Unhandled Python exception Aborted The same crash happens with v2.0.7 though.
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/openshot-qt/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/video/openshot-qt/libopenshot-audio.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/openshot-qt/libopenshot.nix | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 1fc0182a68ac..eb184933964b 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { name = "openshot-qt-${version}"; - version = "2.0.7"; + version = "2.1.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "1s4b61fd8cyjy8kvc25mqd97dkxx6gqmz02i42rrcriz51pw8wgh"; + sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c"; }; buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt chmod +x $out/bin/openshot-qt wrapProgram $out/bin/openshot-qt \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$PYTHONPATH" + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH" ''; doCheck = false; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 8b583d4ec5cb..fdaa049fa428 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-audio-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "0pgw7vzx3znglwm58187ybhg5maa13n4xcy5hrhzfsp8bqhrwkc7"; + sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6"; }; buildInputs = [ diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 2737c48ec83d..841587fcab30 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen -, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp}: +, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp +, cppzmq, czmqpp +}: with stdenv.lib; @@ -8,13 +10,13 @@ let in stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "12nfkris7spn8n4s8fvy2f6yk1hqh97wzh1z3fsdxldg4gppi903"; + sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm"; }; patchPhase = '' @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake doxygen imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby - unittest-cpp + unittest-cpp cppzmq czmqpp ]; LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}"; |