diff options
| author |   Violet Purcell <vimproved@inventati.org> | 2023-09-07 08:05:56 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-09-07 15:47:35 +0100 |
| commit | 0cd39f1f240ebd443106c162bcd7c1b22a55f26c (patch) | |
| tree | 569fc1b030ce34f69a74391791c984d747486f4b /media-libs/alsa-lib/files | |
| parent | media-libs/alsa-lib: backport musl fix for 1.2.10 (diff) | |
| download | gentoo-0cd39f1f240ebd443106c162bcd7c1b22a55f26c.tar.gz gentoo-0cd39f1f240ebd443106c162bcd7c1b22a55f26c.tar.bz2 gentoo-0cd39f1f240ebd443106c162bcd7c1b22a55f26c.zip | |
media-libs/alsa-lib: Backport UMP header file detection fix
Closes: https://bugs.gentoo.org/913513
Closes: https://bugs.gentoo.org/913521
Signed-off-by: Violet Purcell <vimproved@inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/32660
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/alsa-lib/files')
| -rw-r--r-- | media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch new file mode 100644 index 000000000000..a75aa3a85a06 --- /dev/null +++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch @@ -0,0 +1,31 @@ +From https://github.com/alsa-project/alsa-lib/commit/fcce13a6726c52882bd8b7131c61c4eba308792c Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela <perex@perex.cz> +Date: Mon, 4 Sep 2023 09:38:26 +0200 +Subject: [PATCH] control.h: Fix ump header file detection +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Apparently, the control.h is used from apps separately (outside +asoundlib.h). Avoid errors like: + +/usr/include/alsa/control.h:417:47: error: ‘snd_ump_endpoint_info_t’ has not been declared + 417 | int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info); + | ^~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/alsa/control.h:418:44: error: ‘snd_ump_block_info_t’ has not been declared + 418 | int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info); + | ^~~~~~~~~~~~~~~~~~~~ + +Fixes: https://github.com/alsa-project/alsa-lib/issues/348 +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- a/include/control.h ++++ b/include/control.h +@@ -413,6 +413,8 @@ int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev); + int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device); + int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info); + int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev); ++#endif ++#ifdef __ALSA_UMP_H + int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device); + int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info); + int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info); |