From 14308adb0dddda73fe102c8eb92d84b5a4a5cd5c Mon Sep 17 00:00:00 2001 From: Nicholas Vinson Date: Wed, 3 Jan 2024 20:24:36 -0500 Subject: [PATCH] src/Versions.in: Add guards for pcm and timer syms Configure script allows for the disabling of the pcm module. When disabled, the pcm symbols will not be available. Add guards to remove symbols from version map when not present. Closes: https://github.com/alsa-project/alsa-lib/pull/376 Signed-off-by: Nicholas Vinson Signed-off-by: Jaroslav Kysela --- src/Makefile.am | 3 +++ src/Versions.in.in | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index b4a0d5d9..ad5bf8ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,6 +26,9 @@ SUBDIRS += mixer libasound_la_LIBADD += mixer/libmixer.la endif if BUILD_PCM +if VERSIONED_SYMBOLS +VERSION_CPPFLAGS += -DHAVE_PCM_SYMS -DHAVE_TIMER_SYMS +endif SUBDIRS += pcm timer libasound_la_LIBADD += pcm/libpcm.la timer/libtimer.la endif diff --git a/src/Versions.in.in b/src/Versions.in.in index 041eff08..98f36ded 100644 --- a/src/Versions.in.in +++ b/src/Versions.in.in @@ -16,6 +16,7 @@ ALSA_0.9 { }; ALSA_0.9.0rc4 { +#ifdef HAVE_PCM_SYMS global: @SYMBOL_PREFIX@snd_pcm_hw_params_get_access; @@ -42,6 +43,7 @@ ALSA_0.9.0rc4 { @SYMBOL_PREFIX@snd_pcm_hw_params_get_rate_max; @SYMBOL_PREFIX@snd_pcm_hw_params_set_rate_near; @SYMBOL_PREFIX@snd_pcm_hw_params_set_rate_first; + @SYMBOL_PREFIX@snd_pcm_hw_params_set_rate_last; @SYMBOL_PREFIX@snd_pcm_hw_params_get_period_time; @@ -85,22 +87,29 @@ ALSA_0.9.0rc4 { @SYMBOL_PREFIX@snd_pcm_hw_params_set_tick_time_near; @SYMBOL_PREFIX@snd_pcm_hw_params_set_tick_time_first; @SYMBOL_PREFIX@snd_pcm_hw_params_set_tick_time_last; +#endif } ALSA_0.9; ALSA_0.9.0rc8 { +#ifdef HAVE_PCM_SYMS global: @SYMBOL_PREFIX@snd_pcm_forward; @SYMBOL_PREFIX@snd_pcm_status_get_trigger_htstamp; @SYMBOL_PREFIX@snd_pcm_status_get_htstamp; +#endif } ALSA_0.9.0rc4; ALSA_0.9.0 { +#if defined HAVE_PCM_SYMS || defined HAVE_TIMER_SYMS global: +#if defined HAVE_PCM_SYMS @SYMBOL_PREFIX@snd_pcm_type_name; +#endif +#ifdef HAVE_TIMER_SYMS @SYMBOL_PREFIX@snd_timer_query_info; @SYMBOL_PREFIX@snd_timer_query_params; @SYMBOL_PREFIX@snd_timer_query_status; @@ -108,6 +117,8 @@ ALSA_0.9.0 { @SYMBOL_PREFIX@snd_timer_params_get_exclusive; @SYMBOL_PREFIX@snd_timer_params_set_filter; @SYMBOL_PREFIX@snd_timer_params_get_filter; +#endif +#endif } ALSA_0.9.0rc8; ALSA_0.9.3 { @@ -146,11 +157,13 @@ ALSA_1.2.6 { } ALSA_1.1.6; ALSA_1.2.9 { +#ifdef HAVE_PCM_SYMS global: @SYMBOL_PREFIX@snd_pcm_hw_params_is_perfect_drain; @SYMBOL_PREFIX@snd_pcm_hw_params_set_drain_silence; @SYMBOL_PREFIX@snd_pcm_hw_params_get_drain_silence; +#endif } ALSA_1.2.6; ALSA_1.2.10 { -- 2.47.1