Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MU3] Prepare for updated libsndfile #6489

Closed
wants to merge 1 commit into from

Conversation

Jojo-Schmitz
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz commented Aug 24, 2020

This enables us to update libsndfile from the currently used 1.0.25 to 1.0.29 or later (1.0.30 is available meanwhile too, see https://github.com/erikd/libsndfile), which apparently changed the name of the lib from libsndfile-1to just sndfile.
In a separate step the dependencies file for Windows may get updated. If the newer one is found on build, that is taken, else the older one.
This in turn might enable us to add opus support, see https://musescore.org/en/node/288994

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Aug 25, 2020

Attached the updated dependencies.zip (renamed to dependencies.7z.zip as GitHub doesn't allow .7x).
It has 1.0.29 sndfile.dll and sndfile.lib added for 32-bit and 64-bit, sndfile.h updated and sndfile.hh added.
dependencies.7z, as taken from https://github.com/erikd/libsndfile/releases/tag/v1.0.29

Downloading it does report (in Microsoft Security Essentials/Windows Defender Antivirus) it to be infected with a virus/trojan (Trojan:Script/Wacatac.B!ml), not sure why though? Anyhow, further down I attached a newer version, so we can safely ignore this here.
Edit: that report is gone meanwhile, probably a temp glitch with the virus definitions

@Jojo-Schmitz Jojo-Schmitz mentioned this pull request Aug 25, 2020
30 tasks
@anatoly-os
Copy link
Contributor

anatoly-os commented Aug 25, 2020

Do we really want it in 3.5.1, or even 3.6? I would merge this to master only (MU 4).

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Aug 25, 2020

Fine by me, but as long as dependencies.7z doesn't get updated, this PR doesn't make any difference

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Sep 29, 2020

And here the dependencies.7z for libsndfile 1.0.30 as taken from https://github.com/erikd/libsndfile/releases/tag/v1.0.30

Adding Opus support would probably not be wanted in 3.5.1, as it'd introduce new strings (for the export file selectors), even if that'd only be "Opus Audio" or "Ogg Opus Audio", which might not need to get translated at all.
But it also doesn't seem to be trivial to to add Opus support... seems that needs opusfile DLLs, but I can't find those in a ready to use build form, just the sources.

Still there is some value to be able to stay in sync with the latest libsndfile.

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Oct 19, 2020

It is in master now, waiting for it to get merged into 3.x for 3.6. Or a decision not to merge this into 3.x and rather close this PR

@Jojo-Schmitz Jojo-Schmitz changed the title Prepare for updated libsndfile [MU3] Prepare for updated libsndfile Oct 20, 2020
@vpereverzev
Copy link
Member

@Jojo-Schmitz I'm not sure what this might affect for 3.x users, but one thing I know for sure, support for Opus should be in master, because it does not look like something trivial.

So since this is already merged in master, I'd close this PR for 3.x

@Jojo-Schmitz
Copy link
Contributor Author

Without the updated dependencies this PR does nothing, but allow for an updated libsndfile
and opus support needs more than that

Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Apr 8, 2022
"Backport" of a single missing commit from musescore#6483, resp. including the
never merged musescore#6489
Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 12, 2022
"Backport" of a single missing commit from musescore#6483, resp. including the
never merged musescore#6489
Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Mar 5, 2023
"Backport" of a single missing commit from musescore#6483, resp. including the
never merged musescore#6489
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants