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

mostly libupnp fixes #1947

Merged
merged 3 commits into from
Jan 3, 2024
Merged

mostly libupnp fixes #1947

merged 3 commits into from
Jan 3, 2024

Conversation

neheb
Copy link
Contributor

@neheb neheb commented Dec 27, 2023

No description provided.

src/lib/xiph/meson.build Outdated Show resolved Hide resolved
@MaxKellermann
Copy link
Member

I don't understand the patch "upnp: fix compilation with libnpupnp". Your commit message doesn't explain the problem.

@MaxKellermann
Copy link
Member

"MPD uses strict header includes under Windows, which blows up"
This is just the library's fault and there is no pressure for MPD to work around this. I havn't ever heard of a single user using this library on Windows, and there is no CI test case for it. If anybody wants this fixed, they should contact the library maintainer, not MPD.

@neheb
Copy link
Contributor Author

neheb commented Dec 28, 2023

I don't understand the patch "upnp: fix compilation with libnpupnp". Your commit message doesn't explain the problem.

Mismatching () and {}

@neheb
Copy link
Contributor Author

neheb commented Dec 28, 2023

"MPD uses strict header includes under Windows, which blows up" This is just the library's fault and there is no pressure for MPD to work around this. I havn't ever heard of a single user using this library on Windows, and there is no CI test case for it. If anybody wants this fixed, they should contact the library maintainer, not MPD.

It is. I reported to npupnp. It was fixed there. pupnp is left but it seems dead upstream.

edit: added PR anyway: pupnp/pupnp#436

rpc.h under Windows defines interface as struct, which blows up the
build here. Rename to avoid.

Signed-off-by: Rosen Penev <[email protected]>
@neheb
Copy link
Contributor Author

neheb commented Dec 29, 2023

msys2 CI: https://github.com/neheb/MPD/tree/mm

note the stuff I disabled since it doesn't build (mostly wchar vs char issues).

@MaxKellermann
Copy link
Member

msys2 CI: https://github.com/neheb/MPD/tree/mm

Uh, there are tons of errors from system headers. How is that possible? I don't think MPD should aim to support such a target.

@neheb
Copy link
Contributor Author

neheb commented Dec 29, 2023

@MaxKellermann just looked at it. The only thing I see is the iphlapi.h include from lib(np)upnp causing issues because of MPD's lightweight header defines. Unless you mean something else.

Fixes compilation under Windows.

Signed-off-by: Rosen Penev <[email protected]>
Need NarrowPath. Matches what is done in other tests.

Signed-off-by: Rosen Penev <[email protected]>
@neheb
Copy link
Contributor Author

neheb commented Dec 31, 2023

@MaxKellermann MaxKellermann merged commit 13202bf into MusicPlayerDaemon:master Jan 3, 2024
4 checks passed
@neheb neheb deleted the jg branch January 3, 2024 09:28
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.

2 participants