Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2e216c3917f4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7391a22a4467
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 5, 2020

  1. mlt: update from version 6.16.0 to 6.18.0

    @peti
    peti committed Jan 5, 2020
    Copy the full SHA
    605bd8c View commit details

  2. shotcut: update from version 19.09.14 to 19.12.31

    @peti
    peti committed Jan 5, 2020
    Copy the full SHA
    7391a22 View commit details
Showing with 11 additions and 26 deletions.
  1. +5 −19 pkgs/applications/video/shotcut/default.nix
  2. +4 −5 pkgs/development/libraries/mlt/default.nix
  3. +2 −2 pkgs/development/libraries/mlt/qt-5.nix
24 changes: 5 additions & 19 deletions pkgs/applications/video/shotcut/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,34 +3,20 @@
, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools
}:

assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
assert stdenv.lib.versionAtLeast mlt.version "6.8.0";

let
# https://github.com/mltframework/shotcut/issues/771
fixVaapiRendering1 = fetchpatch {
url = "https://github.com/peti/shotcut/commit/038f6839298fc1e9e80ddf84fe168a78118bc625.patch";
sha256 = "153z1g6criszd6gdkw4f5zk0gmh0jar6l2g8fzwjhhcvkdz30vbp";
};
fixVaapiRendering2 = fetchpatch {
url = "https://github.com/peti/shotcut/commit/653c485f92d2847fdac517e3f797c9254826ffab.patch";
sha256 = "1qd0zgyahda72xh3avlg7lg0jq94wq5847154qlrgzj8b4n7vizw";
};
in
assert stdenv.lib.versionAtLeast libmlt.version "6.18.0";
assert stdenv.lib.versionAtLeast mlt.version "6.18.0";

mkDerivation rec {
pname = "shotcut";
version = "19.09.14";
version = "19.12.31";

src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn";
sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9";
};

patches = [ fixVaapiRendering1 fixVaapiRendering2 ];

enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
@@ -74,7 +60,7 @@ mkDerivation rec {
'';
homepage = https://shotcut.org;
license = licenses.gpl3;
maintainers = with maintainers; [ goibhniu woffs ];
maintainers = with maintainers; [ goibhniu woffs peti ];
platforms = platforms.linux;
};
}
9 changes: 4 additions & 5 deletions pkgs/development/libraries/mlt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

stdenv.mkDerivation rec {
pname = "mlt";
version = "6.16.0";
version = "6.18.0";

src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx";
sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx";
};

buildInputs = [
@@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
# 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-gpl" "--enable-gpl3"
"--enable-opengl"
"--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl"
];

enableParallelBuilding = true;
@@ -43,7 +42,7 @@ stdenv.mkDerivation rec {
description = "Open source multimedia framework, designed for television broadcasting";
homepage = https://www.mltframework.org;
license = licenses.gpl3;
maintainers = [ maintainers.tohl ];
maintainers = with maintainers; [ tohl peti ];
platforms = platforms.linux;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/mlt/qt-5.nix
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in

stdenv.mkDerivation rec {
pname = "mlt";
version = "6.16.0";
version = "6.18.0";

src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx";
sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx";
};

buildInputs = [