From 81c438aa207e8fdea776ae946a4d2d3f57cc143f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 22 Jul 2015 22:30:28 +0200 Subject: [PATCH] package/kodi: Rework audio encoder support Make option BR2_PACKAGE_KODI_OPTICALDRIVE invisible, it is only needed when an audio encoder addon is enabled. Add Kconfig submenu for audio encoders to prepare for addition of more binary addons. Signed-off-by: Bernd Kuhls Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/kodi-audioencoder-flac/Config.in | 1 + package/kodi-audioencoder-lame/Config.in | 1 + package/kodi-audioencoder-vorbis/Config.in | 1 + package/kodi-audioencoder-wav/Config.in | 1 + package/kodi/Config.in | 20 +++++++------------- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/package/kodi-audioencoder-flac/Config.in b/package/kodi-audioencoder-flac/Config.in index 799f9c5be7..95acbbadb9 100644 --- a/package/kodi-audioencoder-flac/Config.in +++ b/package/kodi-audioencoder-flac/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_KODI_AUDIOENCODER_FLAC bool "kodi-audioencoder-flac" select BR2_PACKAGE_FLAC + select BR2_PACKAGE_KODI_OPTICALDRIVE select BR2_PACKAGE_LIBOGG help An audioencoder addon for Kodi diff --git a/package/kodi-audioencoder-lame/Config.in b/package/kodi-audioencoder-lame/Config.in index be00296d22..dc6a0cd7e5 100644 --- a/package/kodi-audioencoder-lame/Config.in +++ b/package/kodi-audioencoder-lame/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_AUDIOENCODER_LAME bool "kodi-audioencoder-lame" + select BR2_PACKAGE_KODI_OPTICALDRIVE select BR2_PACKAGE_LAME help An audioencoder addon for Kodi diff --git a/package/kodi-audioencoder-vorbis/Config.in b/package/kodi-audioencoder-vorbis/Config.in index ab8b4b3b24..8b84626f08 100644 --- a/package/kodi-audioencoder-vorbis/Config.in +++ b/package/kodi-audioencoder-vorbis/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_AUDIOENCODER_VORBIS bool "kodi-audioencoder-vorbis" + select BR2_PACKAGE_KODI_OPTICALDRIVE select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBVORBIS help diff --git a/package/kodi-audioencoder-wav/Config.in b/package/kodi-audioencoder-wav/Config.in index 6813f0285b..6bdbb9aa37 100644 --- a/package/kodi-audioencoder-wav/Config.in +++ b/package/kodi-audioencoder-wav/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_AUDIOENCODER_WAV bool "kodi-audioencoder-wav" + select BR2_PACKAGE_KODI_OPTICALDRIVE help An audioencoder addon for Kodi diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 8dd37942db..6ec2463584 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -245,20 +245,14 @@ config BR2_PACKAGE_KODI_WAVPACK Select this if you want to play back WV files. config BR2_PACKAGE_KODI_OPTICALDRIVE - bool "optical drive" - help - Enable support for optical drives - -if BR2_PACKAGE_KODI_OPTICALDRIVE - -comment "Kodi audioencoder addons" - -source "package/kodi-audioencoder-flac/Config.in" -source "package/kodi-audioencoder-lame/Config.in" -source "package/kodi-audioencoder-vorbis/Config.in" -source "package/kodi-audioencoder-wav/Config.in" + bool -endif # BR2_PACKAGE_KODI_OPTICALDRIVE +menu "Audio encoder addons" + source "package/kodi-audioencoder-flac/Config.in" + source "package/kodi-audioencoder-lame/Config.in" + source "package/kodi-audioencoder-vorbis/Config.in" + source "package/kodi-audioencoder-wav/Config.in" +endmenu comment "Kodi PVR addons" -- 2.30.2