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
31 lines
912 B
Diff
31 lines
912 B
Diff
From 8e6351f19d803e969c5d2fc874033f3cf68b89c4 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Tue, 12 Dec 2023 13:47:03 +0100
|
|
Subject: [PATCH] aplay: allow to compile with older alsa-lib (subformat)
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
aplay/aplay.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/aplay/aplay.c b/aplay/aplay.c
|
|
index 03443df52d33..fc4bac697226 100644
|
|
--- a/aplay/aplay.c
|
|
+++ b/aplay/aplay.c
|
|
@@ -641,8 +641,12 @@ int main(int argc, char *argv[])
|
|
}
|
|
break;
|
|
case OPT_SUBFORMAT:
|
|
+#if SND_LIB_VER(1, 2, 10) < SND_LIB_VERSION
|
|
rhwparams.subformat = snd_pcm_subformat_value(optarg);
|
|
if (rhwparams.subformat == SND_PCM_SUBFORMAT_UNKNOWN) {
|
|
+#else
|
|
+ if (strcasecmp(optarg, "std") != 0 && strcasecmp(optarg, "standard") != 0) {
|
|
+#endif
|
|
error(_("wrong extended subformat '%s'"), optarg);
|
|
prg_exit(EXIT_FAILURE);
|
|
}
|
|
--
|
|
2.35.3
|
|
|