diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-23 20:53:00 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-23 20:53:00 +0100 |
| commit | b192d3d38b57dbaaa5eca3fa14b1e727b7f6b7b5 (patch) | |
| tree | 1d04ef16a674401dfa5823ad15df2fab2aff5fc4 | |
| parent | c309de53997feff3286295fb2d71657f112a15db (diff) | |
| parent | acb78384d8728d5c3270904bb14257c7a56e8820 (diff) | |
Merge pull request #71934 from Riteo/who-thought-alsa-didnt-follow-posix
Fix builtin alsa headers building on musl
| -rw-r--r-- | thirdparty/linuxbsd_headers/README.md | 1 | ||||
| -rw-r--r-- | thirdparty/linuxbsd_headers/alsa/asoundlib.h | 2 | ||||
| -rw-r--r-- | thirdparty/linuxbsd_headers/alsa/patches/use-standard-poll-h.diff | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/thirdparty/linuxbsd_headers/README.md b/thirdparty/linuxbsd_headers/README.md index 450c0e78aa..af902aa97a 100644 --- a/thirdparty/linuxbsd_headers/README.md +++ b/thirdparty/linuxbsd_headers/README.md @@ -11,6 +11,7 @@ readability. - Version: 1.1.3-5 - License: LPGL-2.1+ +Patches in the `patches` directory should be re-applied after updates. ## dbus diff --git a/thirdparty/linuxbsd_headers/alsa/asoundlib.h b/thirdparty/linuxbsd_headers/alsa/asoundlib.h index 3c2766e325..a546194382 100644 --- a/thirdparty/linuxbsd_headers/alsa/asoundlib.h +++ b/thirdparty/linuxbsd_headers/alsa/asoundlib.h @@ -35,7 +35,7 @@ #include <string.h> #include <fcntl.h> #include <assert.h> -#include <sys/poll.h> +#include <poll.h> #include <errno.h> #include <stdarg.h> #include <endian.h> diff --git a/thirdparty/linuxbsd_headers/alsa/patches/use-standard-poll-h.diff b/thirdparty/linuxbsd_headers/alsa/patches/use-standard-poll-h.diff new file mode 100644 index 0000000000..8d536df579 --- /dev/null +++ b/thirdparty/linuxbsd_headers/alsa/patches/use-standard-poll-h.diff @@ -0,0 +1,11 @@ +--- a/asoundlib.h ++++ b/asoundlib.h +@@ -35,7 +35,7 @@ + #include <string.h> + #include <fcntl.h> + #include <assert.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <errno.h> + #include <stdarg.h> + #include <endian.h> |