public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98786 from woffs/shotcut-20.09.13 

shotcut: 20.07.11 -> 20.09.13, mlt: 6.20.0 -> 6.22.1
This commit is contained in:
Peter Simons 2020-09-26 09:12:52 +02:00 committed by GitHub
parent 2768436826 c835358078
commit 502845c3e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/video/shotcut/default.nix
View File

@ -1,20 +1,21 @@
{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt { stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt
, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets , jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets
, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools , qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools, genericUpdater
, common-updater-scripts
}: }:
assert stdenv.lib.versionAtLeast libmlt.version "6.20.0"; assert stdenv.lib.versionAtLeast libmlt.version "6.22.1";
assert stdenv.lib.versionAtLeast mlt.version "6.20.0"; assert stdenv.lib.versionAtLeast mlt.version "6.22.1";
mkDerivation rec { mkDerivation rec {
pname = "shotcut"; pname = "shotcut";
version = "20.07.11"; version = "20.09.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mltframework"; owner = "mltframework";
repo = "shotcut"; repo = "shotcut";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ajg0bpdckhvmmsliy1xky9p4mdypnaw3z3cvfsdrm0zcihbgazv"; sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -47,6 +48,12 @@ mkDerivation rec {
cp -r src/qml $out/share/shotcut/ cp -r src/qml $out/share/shotcut/
''; '';
passthru.updateScript = genericUpdater {
inherit pname version;
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
rev-prefix = "v";
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A free, open source, cross-platform video editor"; description = "A free, open source, cross-platform video editor";
longDescription = '' longDescription = ''

12
pkgs/development/libraries/mlt/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, makeWrapper { stdenv, fetchFromGitHub, makeWrapper
, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
, libvorbis, libxml2, movit, pkgconfig, sox , libvorbis, libxml2, movit, pkgconfig, sox
, gtk2 , gtk2, genericUpdater, common-updater-scripts
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mlt"; pname = "mlt";
version = "6.20.0"; version = "6.22.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mltframework"; owner = "mltframework";
repo = "mlt"; repo = "mlt";
rev = "v${version}"; rev = "v${version}";
sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk"; sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k";
}; };
buildInputs = [ buildInputs = [
@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g"
''; '';
passthru.updateScript = genericUpdater {
inherit pname version;
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
rev-prefix = "v";
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Open source multimedia framework, designed for television broadcasting"; description = "Open source multimedia framework, designed for television broadcasting";
homepage = "https://www.mltframework.org"; homepage = "https://www.mltframework.org";

12
pkgs/development/libraries/mlt/qt-5.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate { stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg
, fftw, vid-stab, opencv3, ladspa-sdk , fftw, vid-stab, opencv3, ladspa-sdk, genericUpdater, common-updater-scripts
}: }:
let inherit (stdenv.lib) getDev; in let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mlt"; pname = "mlt";
version = "6.20.0"; version = "6.22.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mltframework"; owner = "mltframework";
repo = "mlt"; repo = "mlt";
rev = "v${version}"; rev = "v${version}";
sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk"; sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k";
}; };
buildInputs = [ buildInputs = [
@ -57,6 +57,12 @@ stdenv.mkDerivation rec {
inherit ffmpeg; inherit ffmpeg;
}; };
passthru.updateScript = genericUpdater {
inherit pname version;
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
rev-prefix = "v";
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Open source multimedia framework, designed for television broadcasting"; description = "Open source multimedia framework, designed for television broadcasting";
homepage = "https://www.mltframework.org/"; homepage = "https://www.mltframework.org/";