Skip to content

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

Merged
wegank merged 4 commits intoNixOS:masterfrom
woffs:shotcut-25.05
Oct 8, 2025
Merged

shotcut: 25.01 -> 25.08, mlt: 7.30 -> 7.32, fix mlt-qt6 in shotcut#421788
wegank merged 4 commits intoNixOS:masterfrom
woffs:shotcut-25.05

Conversation

@woffs
Copy link
Contributor

@woffs woffs commented Jul 2, 2025

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. labels Jul 2, 2025
@nix-owners nix-owners bot requested a review from peti July 2, 2025 13:31
@woffs woffs mentioned this pull request Jul 2, 2025
3 tasks
@wegank
Copy link
Member

wegank commented Jul 2, 2025

The last mlt bump was reverted because of #411302, would you please check if the problem persists? If so, we probably can't backport this PR.

@woffs
Copy link
Contributor Author

woffs commented Jul 2, 2025

The last mlt bump was reverted because of #411302, would you please check if the problem persists? If so, we probably can't backport this PR.

How to reproduce the original issue #411302?
nix-build -I nixpkgs=flake:nixpkgs/e4633ab26454 --expr 'with import <nixpkgs> { }; pkgs.mlt.override {cudaSupport = true;}'
just succeeds.

@wegank
Copy link
Member

wegank commented Jul 2, 2025

Does nix-build -I nixpkgs=flake:nixpkgs/e4633ab26454 --expr 'with import <nixpkgs> { config.cudaSupport = true; }; pkgs.mlt' work for you?

@woffs
Copy link
Contributor Author

woffs commented Jul 2, 2025

Does nix-build -I nixpkgs=flake:nixpkgs/e4633ab26454 --expr 'with import <nixpkgs> { config.cudaSupport = true; }; pkgs.mlt' work for you?

I see, it fails.

But it succeeds with nixpkgs=flake:github:woffs/nixpkgs/shotcut-25.05 (this PR) and even with nixpkgs=flake:github:woffs/nixpkgs/shotcut-25.05-bpo (this PR, backported to release-25.05). 🙂

@woffs woffs mentioned this pull request Jul 13, 2025
3 tasks
@ghost ghost mentioned this pull request Jul 28, 2025
3 tasks
@woffs woffs changed the title shotcut: 25.01.25 -> 25.05.11, mlt: 7.30.0 -> 7.32.0, fix mlt-qt6 in shotcut shotcut: 25.01 -> 25.07, mlt: 7.30 -> 7.32, fix mlt-qt6 in shotcut Jul 29, 2025
@ssoouurrggrraappeess
Copy link

Working hard or hardly working?

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 6, 2025
@luzpaz
Copy link
Contributor

luzpaz commented Aug 18, 2025

@woffs woffs changed the title shotcut: 25.01 -> 25.07, mlt: 7.30 -> 7.32, fix mlt-qt6 in shotcut shotcut: 25.01 -> 25.08, mlt: 7.30 -> 7.32, fix mlt-qt6 in shotcut Aug 28, 2025
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 28, 2025
@Architect423
Copy link

I am using Shotcut 25.01.25 on Unstable.

I was unable to create any simple text filters, and rich text filters are absent from the filter list. I infer this may be related to #420054 which I also experienced.

#420054 can be worked around by using ffmpeg to convert the image to a looped video. Example:

ffmpeg -loop 1 -i dt_far_resized.png -c:v libx264 -t 5 -pix_fmt yuv420p -vf "format=yuv420p" dt_far_resized_video.mp4

I ran:

nix run github:woffs/nixpkgs/shotcut-25.05#shotcut

This version allowed me to create text filters and the absent filters were present.

I also tested the ability to drag .png files onto the timeline. That is fixed as well.

Great work thank you @woffs

@maxmosk
Copy link
Contributor

maxmosk commented Oct 7, 2025

Can this PR be merged? It can fix build with cmake 4 for shotcut and simplify my life ;)

@wegank wegank added this pull request to the merge queue Oct 8, 2025
Merged via the queue into NixOS:master with commit 234c6c0 Oct 8, 2025
28 of 31 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Oct 8, 2025

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.05
git worktree add -d .worktree/backport-421788-to-release-25.05 origin/release-25.05
cd .worktree/backport-421788-to-release-25.05
git switch --create backport-421788-to-release-25.05
git cherry-pick -x dcd01e0d946cbf6db8166865a28e8e829191314b 89d8985dffc068ad5b2195473086257b48d239ff 47780b3415d3b004c6f7ba70e99521bd8430e930 be1ff94ea67dcdeda692068537ed0ebed04183af

@woffs
Copy link
Contributor Author

woffs commented Nov 1, 2025

@wegank thank you for merging. I do not understand why the movit commit has been inserted here though.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

shotcut: images do not work

6 participants