Skip to content

Merge changes from 2.6 into main#15733

Merged
ronso0 merged 3 commits into
mainfrom
sync-branch-2.6-to-main
Dec 10, 2025
Merged

Merge changes from 2.6 into main#15733
ronso0 merged 3 commits into
mainfrom
sync-branch-2.6-to-main

Conversation

@mixxxbot
Copy link
Copy Markdown
Collaborator

New content has landed in the 2.6 branch, so let's merge the changes into main

@ronso0 ronso0 merged commit 9e947ae into main Dec 10, 2025
18 of 19 checks passed
@ronso0 ronso0 deleted the sync-branch-2.6-to-main branch December 10, 2025 10:11
@acolombier
Copy link
Copy Markdown
Member

Looks like this merge broke main as the latest djinterop update is breaking Android. Are we okay with me reverting it in main, till this is properly fixed?

On another note, I really need to fix the auto merge!

@daschuer
Copy link
Copy Markdown
Member

No, it is not Ok to revert the djinterop update in main.
There are users using man with Engine DJ but no one is using Android.

So it is better to build Android without djinteropt, or of cause just fix the issue.

@acolombier
Copy link
Copy Markdown
Member

I would appreciate if you could have a little bit more respect for the effort I am putting on briging Mixxx on Android here, rather than just saying "nobody cares about Android, we can just break it".

@JoergAtGithub as you initially wrote that comment, I would like to hear your opinion, so we can either revert djinterop and disable Android build.

@daschuer
Copy link
Copy Markdown
Member

Please read my comment again, you cited it incorrectly. I can assure you, it was not ment disrespectful. You Android efforts are very much welcome.

@JoergAtGithub
Copy link
Copy Markdown
Member

JoergAtGithub commented Dec 13, 2025

To my understanding downloading libdjinterop and building from source never worked for Android. We just not saw it, because the VCPKG version of libdjinterop is always prefered if available. The Android build will pass again, once we updated the VCPKG buildenv, where I'm already working on.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants