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

wavpack: WavpackOpenFileInput is not used, so don't load it #586

Merged
merged 1 commit into from
Jan 15, 2024

Conversation

madebr
Copy link
Contributor

@madebr madebr commented Jan 15, 2024

ftruncate is used throughWavpackOpenFileInput.
Since SDL_mixer uses WavpackOpenFileInputEx instead of WavpackOpenFileInput, don't look for WavpackOpenFileInput.

Depends on libsdl-org/WavPack#2

Fixes #585

src/codecs/music_wavpack.c Outdated Show resolved Hide resolved
@madebr madebr force-pushed the no-more-WavpackOpenFileInput-for-me branch from 4dc9fcd to dadc6b2 Compare January 15, 2024 14:29
@sezero
Copy link
Contributor

sezero commented Jan 15, 2024

Depends on libsdl-org/WavPack#2

It will be a problem if you rebase that PR: you should manually merge it
like:

git checkout 5.6.0-sdl && \
git pull https://github.com/madebr/WavPack.git no-WavpackOpenFileInput-for-ps2-and-psp && \
git push

... so that that the relevant commit is in our branch.

@madebr
Copy link
Contributor Author

madebr commented Jan 15, 2024

Indeed, it will be a problem when it is merged through the github ui.
If you think the patch is correct, I can just push to libsdl-org/wavpack directly.

@sezero
Copy link
Contributor

sezero commented Jan 15, 2024

The patch is sensible and I'm not opposed to castrating 3rd party libs myself in our forks for our purposes, so green lite from me.

@sezero
Copy link
Contributor

sezero commented Jan 15, 2024

And, we should cherry-pick this patch to SDL2 branch too..

@madebr madebr merged commit dadc6b2 into libsdl-org:main Jan 15, 2024
5 checks passed
@madebr madebr deleted the no-more-WavpackOpenFileInput-for-me branch January 15, 2024 15:08
@madebr
Copy link
Contributor Author

madebr commented Jan 15, 2024

I applied it to SDL2_mixer in 40b5164 (I forgot to add -x)

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.

wavpack misses ftruncate
2 participants