Skip to content

Sync 2.5 to 2.6#15924

Merged
acolombier merged 59 commits intomixxxdj:2.6from
ronso0:sync-2.5
Feb 5, 2026
Merged

Sync 2.5 to 2.6#15924
acolombier merged 59 commits intomixxxdj:2.6from
ronso0:sync-2.5

Conversation

@ronso0
Copy link
Copy Markdown
Member

@ronso0 ronso0 commented Jan 31, 2026

There were conflicts in these files, please double-check if your familiar with it:
.github/workflows/build.yml -> actions versions
COPYING -> copyright year
LICENSE -> copyright year
src/engine/enginebuffer.cpp

ArthurVimond and others added 30 commits March 7, 2025 11:13
@ArthurVimond
fix(controllers): fix crossfader cut on Traktor Kontrol Z1
69b9066 
This fixes the issue mixxxdj#14450 (mixxxdj#14450)
@djantti
Add initial Flatpak packaging files
5c4d610
@djantti
Convert main manifest and modules to YAML for better code legibility
c81af5e
@djantti
Remove unused workaround for building old LV2 plugins
9eed61b
@djantti
Do not build benchmarks or tests
e9d4a3e
@djantti
Change libdjinterop version to 0.24.3 for Mixxx 2.5 branch
151ad49
@djantti
Fix Ubuntu 24.04 build by setting correct pkg-config path
263591c
@djantti
Add Flatpak build scripts
33d0993
@djantti
Add option for installing the SDK debug extension
a38704a
@djantti
Append manifest directory to Flatpak filesystem permissions
d8e8801
@djantti
Use more descriptive wording in usage text
228a8d4
@djantti
Add information for Flatpak builds
00cdd74
@djantti
Add Flatpak build README file
ed0eb46
@daschuer
Pass effect request message as const.
bd915ec
@daschuer
Improve debug message
2da627e
@daschuer
Remove defaulted fadeout paremeter.
51c2319
@daschuer
Add missing return
47eea4e
@daschuer
Avoid UB after migrating to a ChannelHandleMap<unique_ptr_vector<Effe…
ec70f95 
…ctSpecificState>>
@daschuer
Make m_enableState a bool and use the m_chainStatusForChannelMatrix a…
557ea40 
…s single source of truth for enabling and disabling.
@ronso0
Interface preferences: use main window screen to detect if skin fits
13469e6
@acolombier
(Belated) Happy New Year 2026!
b939d2c
@ronso0
Merge pull request mixxxdj#15852 from acolombier/chore/update-copyright
4c6d76e 
(Belated) Happy New Year 2026!
@ronso0
Tracks: avoid re-sorting table after track removal (hide, remove, purge)
1379c77 
Implemented for track models that don't have a position column (playlists)
as that still requires rebuilding the row cache
@daschuer
Merge pull request mixxxdj#15872 from ronso0/tracks-avoid-resorting
2f65506 
Tracks: avoid re-sorting table when purging/hiding tracks
@daschuer
Merge pull request mixxxdj#15824 from ronso0/skins-screen-of-mainwindow
0f9b81d 
Interface preferences: use main window screen to detect if skin fits
@BoredGuy1
Changed enginebuffer to switch scaling algorithm instantly when scrat…
c517146 
…ching
@BoredGuy1
Edited comment, removed redunant conditional
36bf772
@dependabot
Bump azure/trusted-signing-action from 0.5.10 to 1.0.0
c5450c9 
Bumps [azure/trusted-signing-action](https://github.com/azure/trusted-signing-action) from 0.5.10 to 1.0.0.
- [Release notes](https://github.com/azure/trusted-signing-action/releases)
- [Commits](Azure/artifact-signing-action@v0.5.10...v1.0.0)

---
updated-dependencies:
- dependency-name: azure/trusted-signing-action
  dependency-version: 1.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@acolombier
Merge pull request mixxxdj#15884 from mixxxdj/dependabot/github_actio…
48c91a3 
…ns/2.5/azure/trusted-signing-action-1.0.0

Bump azure/trusted-signing-action from 0.5.10 to 1.0.0
@blackhold
debian_buildenv.sh it asks to install fonts-ubuntu but it should be f…
ad80482 
…onts-ubuntu-title issue mixxxdj#15816
@github-actions github-actions Bot added preferences packaging developer experience Issues, bugs and PRs related to the development process, development environment & developer docs labels Jan 31, 2026
@acolombier
Copy link
Copy Markdown
Member

acolombier commented Jan 31, 2026

Thanks for looking into this. It looks like the CI is failing now

@ronso0
Copy link
Copy Markdown
Member Author

ronso0 commented Feb 1, 2026

Can we ignore the pre-commit complaint?
In the original PR it wasn't an issue, why now?

@daschuer
Copy link
Copy Markdown
Member

daschuer commented Feb 2, 2026

Can it be a conflict edit that do not touch the same lines?

@ronso0
Copy link
Copy Markdown
Member Author

ronso0 commented Feb 2, 2026

Hmm I don't think so. Last time the Z1 script has been touched in the 2.6 branch was 3 years ago, so 2.5 changes are really only the changes from https://github.com/mixxxdj/mixxx/pull/14451/files (where pre-commit passed)

@acolombier
Copy link
Copy Markdown
Member

acolombier commented Feb 2, 2026 •
edited
Loading

This is related to this change(PR), only in 2.6.

This line should be removed as it redeclare controller locally as global symbol, but it should be defined in the eslint file (like the 2.6 PR above). This fix shouldn't have made it in IMO... Should we fixup 2.5 and cherry-pick 6e42d52297a48535375fd269dee2f2ac721c156b?

@ronso0
Copy link
Copy Markdown
Member Author

ronso0 commented Feb 2, 2026

Sounds good, go ahead.
Please backport+fixup to 2.5 directly and let me know when I can rebase this one.

@ronso0 ronso0 mentioned this pull request Feb 4, 2026
Merged
@ronso0
Copy link
Copy Markdown
Member Author

ronso0 commented Feb 5, 2026

CI is happy, except the macOS 15 x64 runner failed earlier during artifact upload -- seems someone already restarted that..

@acolombier acolombier merged commit b96ecf7 into mixxxdj:2.6 Feb 5, 2026
26 of 27 checks passed
@ronso0 ronso0 deleted the sync-2.5 branch February 5, 2026 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@acolombier acolombier acolombier approved these changes

Assignees

No one assigned

Labels

code quality controller mappings developer experience Issues, bugs and PRs related to the development process, development environment & developer docs effects engine library packaging preferences search ui

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@ronso0 @acolombier @daschuer @ArthurVimond @djantti @BoredGuy1 @blackhold @xARSENICx @JoergAtGithub