Unverified Commit 234c6c05 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

shotcut: 25.01 -> 25.08, mlt: 7.30 -> 7.32, fix mlt-qt6 in shotcut (#421788)

parents 1598da9c be1ff94e

pkgs/by-name/ml/mlt/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ 


stdenv.mkDerivation rec {

  pname = "mlt";

  version = "7.30.0";

  version = "7.32.0";



  src = fetchFromGitHub {

    owner = "mltframework";

    repo = "mlt";

    tag = "v${version}";

    hash = "sha256-z1bW+hcVeMeibC1PUS5XNpbkNB+75YLoOWZC2zuDol4=";

    hash = "sha256-8T5FXXGs7SxL6nD+R1Q/0Forsdp5Xux4S3VLvgqXzw8=";

    # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate.

    # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on

    # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545

pkgs/by-name/mo/movit/package.nix

+7 −6
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec { 
    libepoxy

  ];



  env = {

  env =

    lib.optionalAttrs stdenv.cc.isGNU {

      NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest

    }

    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {

pkgs/by-name/sh/shotcut/package.nix

+6 −5
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
  frei0r,

  ladspaPlugins,

  gettext,

  mlt,

  jack1,

  pkg-config,

  fftw,

  qt6,

  qt6Packages,

  cmake,

  gitUpdater,

  ffmpeg,
@@ -19,13 +19,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "shotcut";

  version = "25.01.25";

  version = "25.08.16";



  src = fetchFromGitHub {

    owner = "mltframework";

    repo = "shotcut";

    tag = "v${finalAttrs.version}";

    hash = "sha256-YrnmhxD7Yf2LgdEaBU4mmRdvZdO6VQ6IAb4s+V9QvLM=";

    hash = "sha256-PpMfiqUwG11H+7sLkp3sLzDWjco1OxYqGyfMAFojSPU=";

  };



  nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { 
    frei0r

    ladspaPlugins

    gettext

    mlt

    qt6Packages.mlt

    fftw

    qt6.qtbase

    qt6.qttools
@@ -54,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: { 


  patches = [

    (replaceVars ./fix-mlt-ffmpeg-path.patch {

      inherit mlt ffmpeg;

      inherit ffmpeg;

      mlt = qt6Packages.mlt;

    })

  ];