Re: [Buildroot] [PATCH] package/alsa-utils: fix two build issues following 1.2.7 bump

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Thomas, All,

On 2022-07-17 19:35 +0200, Thomas Petazzoni via buildroot spake thusly:
> Commit 4dc8563363d639255217ffc59482eaccf93a1b51 ("package/alsa-utils:
> bump version to 1.2.7") has bumped alsa-utils to 1.2.7, triggering
> several build failures in the autobuilders.
> 
> The two build issues are fixed by two different patches, both of which
> have been submitted upstream.
> 
> The first patch fixes:
> 
>   http://autobuild.buildroot.net/results/c185ad120eb95cb3af0cd3be5fe47c924c565d3e/
> 
> The second patch fixes:
> 
>   http://autobuild.buildroot.net/results/31f52013db927511bbf0ad8e9d8701ac70e27be0/
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
[--SNIP--]
> diff --git a/package/alsa-utils/0002-aplay-aplay.c-make-UCM-support-optional.patch b/package/alsa-utils/0002-aplay-aplay.c-make-UCM-support-optional.patch
> new file mode 100644
> index 0000000000..cd5c96bd55
> --- /dev/null
> +++ b/package/alsa-utils/0002-aplay-aplay.c-make-UCM-support-optional.patch
> @@ -0,0 +1,89 @@
> +From 1921efacfe1a230021849b83b2877c8f239b44ab Mon Sep 17 00:00:00 2001
> +From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> +Date: Sun, 17 Jul 2022 19:09:04 +0200
> +Subject: [PATCH] aplay/aplay.c: make UCM support optional
> +
> +Commit 90f59671784a7e47b40485095cd66892d4840ed7 ("topology:
> +pre-processor: Move the call to expand variables") modified aplay by
> +unconditionally invoking features of the use case manager (UCM) from
> +alsa-lib. However, alsa-lib can be compiled with UCM support.

I guess you meant:  alsa-lib can be compiled with*out* UCM support.

Fixed, and applied to master, thanks.

Regards,
Yann E. MORIN.

> +In order to properly support this situation, this commit changes aplay
> +to only conditionally compile the UCM related code.
> +
> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> +Upstream: https://mailman.alsa-project.org/pipermail/alsa-devel/2022-July/203847.html
> +---
> + aplay/aplay.c | 10 ++++++++++
> + 1 file changed, 10 insertions(+)
> +
> +diff --git a/aplay/aplay.c b/aplay/aplay.c
> +index b3b3635..59f937d 100644
> +--- a/aplay/aplay.c
> ++++ b/aplay/aplay.c
> +@@ -41,7 +41,9 @@
> + #include <time.h>
> + #include <locale.h>
> + #include <alsa/asoundlib.h>
> ++#ifdef HAVE_ALSA_USE_CASE_H
> + #include <alsa/use-case.h>
> ++#endif
> + #include <assert.h>
> + #include <termios.h>
> + #include <signal.h>
> +@@ -453,6 +455,7 @@ static ssize_t xwrite(int fd, const void *buf, size_t count)
> + 	return offset;
> + }
> + 
> ++#ifdef HAVE_ALSA_USE_CASE_H
> + static int open_ucm(snd_use_case_mgr_t **uc_mgr, char **pcm_name, const char *name)
> + {
> + 	char *s, *p;
> +@@ -476,6 +479,7 @@ static int open_ucm(snd_use_case_mgr_t **uc_mgr, char **pcm_name, const char *na
> + 	}
> + 	return err;
> + }
> ++#endif
> + 
> + static long parse_long(const char *str, int *err)
> + {
> +@@ -553,7 +557,9 @@ int main(int argc, char *argv[])
> + 	int do_device_list = 0, do_pcm_list = 0, force_sample_format = 0;
> + 	snd_pcm_info_t *info;
> + 	FILE *direction;
> ++#ifdef HAVE_ALSA_USE_CASE_H
> + 	snd_use_case_mgr_t *uc_mgr = NULL;
> ++#endif
> + 
> + #ifdef ENABLE_NLS
> + 	setlocale(LC_ALL, "");
> +@@ -852,6 +858,7 @@ int main(int argc, char *argv[])
> + 		goto __end;
> + 	}
> + 
> ++#ifdef HAVE_ALSA_USE_CASE_H
> + 	if (strncmp(pcm_name, "ucm.", 4) == 0) {
> + 		err = open_ucm(&uc_mgr, &pcm_name, pcm_name + 4);
> + 		if (err < 0) {
> +@@ -861,6 +868,7 @@ int main(int argc, char *argv[])
> + 		if (verbose)
> + 			fprintf(stderr, _("Found UCM PCM device: %s\n"), pcm_name);
> + 	}
> ++#endif
> + 
> + 	err = snd_pcm_open(&handle, pcm_name, stream, open_mode);
> + 	if (err < 0) {
> +@@ -951,8 +959,10 @@ int main(int argc, char *argv[])
> + 	if (verbose==2)
> + 		putchar('\n');
> + 	snd_pcm_close(handle);
> ++#ifdef HAVE_ALSA_USE_CASE_H
> + 	if (uc_mgr)
> + 		snd_use_case_mgr_close(uc_mgr);
> ++#endif
> + 	handle = NULL;
> + 	free(audiobuf);
> +       __end:
> +-- 
> +2.36.1
> +
> -- 
> 2.36.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot