Takashi Iwai
c349a7f6d8
- Backport upstream fixes: buffer overflow fixes in aplay, segfault in aplaymidi, etc: 0008-topology-include-locale.h.patch 0009-nhlt-dmic-info.c-include-sys-types.h.patch 0010-topology-pre-processor-Add-support-for-enum-controls.patch 0011-configure.ac-fix-UMP-support-detection.patch 0012-bat-really-skip-analysis-of-the-first-period-and-upd.patch 0013-topology-add-include-for-ENABLE_NLS-on-musl.patch 0014-nhlt-use-stdint.h-types.patch 0015-Revert-nhlt-dmic-info.c-include-sys-types.h.patch 0016-aplay-use-stdint.h-types-instead-u_int-u_short-u_cha.patch 0017-alsa-restore.rules-use-devnode-instead-number-atribu.patch 0018-nhlt-Revert-SSP_ANALOG-device_type-field.patch 0019-alsactl-fix-potential-buffer-overwrite.patch 0020-aplay-fix-buffer-overflow-and-tainted-format-string.patch 0021-misc-fix-incorrect-usages-of-strerror.patch 0022-aplay-Add-option-for-specifying-subformat.patch 0023-aplay-allow-to-compile-with-older-alsa-lib-subformat.patch 0024-aplay-log-pcm-status-before-reporting-a-fatal-error.patch 0025-aplay-enable-timestamps-by-default.patch 0026-aplay-status-dumps-are-called-only-in-verbose-mode.patch 0027-aplaymidi-Set-event-completely-for-tempo-event.patch OBS-URL: https://build.opensuse.org/request/show/1137523 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=210
40 lines
1.0 KiB
Diff
40 lines
1.0 KiB
Diff
From d272c5d935b2ff8acc00f16317f1f960b02ed3a1 Mon Sep 17 00:00:00 2001
|
|
From: Sam James <sam@gentoo.org>
|
|
Date: Thu, 7 Sep 2023 21:23:51 +0100
|
|
Subject: [PATCH] topology: add include for ENABLE_NLS on musl
|
|
|
|
Needed for setlocale().
|
|
|
|
(After rebasing to pick up 8c229270f6bae83b705a03714c46067a7aa57b02, just
|
|
move it to be guarded as the include now exists.)
|
|
|
|
Closes: https://github.com/alsa-project/alsa-utils/pull/234
|
|
Signed-off-by: Sam James <sam@gentoo.org>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
topology/topology.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/topology/topology.c b/topology/topology.c
|
|
index 5d03a8b133b8..98b000aa5031 100644
|
|
--- a/topology/topology.c
|
|
+++ b/topology/topology.c
|
|
@@ -32,11 +32,13 @@
|
|
#include <sys/stat.h>
|
|
#include <getopt.h>
|
|
#include <assert.h>
|
|
-#include <locale.h>
|
|
|
|
#include <alsa/asoundlib.h>
|
|
#include <alsa/topology.h>
|
|
#include "gettext.h"
|
|
+#ifdef ENABLE_NLS
|
|
+#include <locale.h>
|
|
+#endif
|
|
#include "version.h"
|
|
#include "topology.h"
|
|
|
|
--
|
|
2.35.3
|
|
|