| Message ID | 20220728123215.2617378-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/mpv: simplify alsa-lib feature selection | expand |
On Thu, 28 Jul 2022 14:32:15 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Instead of having the user need to figure out that 2 alsa-lib features > are needed for mpv ALSA support, have the top-level mpv option select > the relevant alsa-lib features, when alsa-lib is enabled as already done > for pulseaudio in commit 97cd3680a4cc4bc0c71bccccb1459eda4b880159 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/mpv/Config.in | 2 ++ > package/mpv/mpv.mk | 3 +-- > 2 files changed, 3 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas
diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 81b1e24b5f..6811497d73 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -12,6 +12,8 @@ config BR2_PACKAGE_MPV depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h depends on BR2_TOOLCHAIN_HAS_ATOMIC + select BR2_PACKAGE_ALSA_LIB_MIXER if BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_PCM if BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index ff77f248e5..f9250070d1 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -39,8 +39,7 @@ else MPV_CONF_OPTS += --enable-libmpv-shared --disable-libmpv-static endif -# ALSA support requires pcm+mixer -ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) MPV_CONF_OPTS += --enable-alsa MPV_DEPENDENCIES += alsa-lib else
Instead of having the user need to figure out that 2 alsa-lib features are needed for mpv ALSA support, have the top-level mpv option select the relevant alsa-lib features, when alsa-lib is enabled as already done for pulseaudio in commit 97cd3680a4cc4bc0c71bccccb1459eda4b880159 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/mpv/Config.in | 2 ++ package/mpv/mpv.mk | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-)