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 <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/kodi-audioencoder-flac/Config.in b/package/kodi-audioencoder-flac/Config.in
index 799f9c5be742416c73e9de66b4995db2b6800b7f..95acbbadb951177e3290f87731a089ca5daf9c7d 100644 (file)
--- 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 be00296d2247cd56645c0d923dd1d84f704d0051..dc6a0cd7e5cb76a69e9d92dd001f93914c15d6ec 100644 (file)
--- 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 ab8b4b3b24c1b426983c2bc34bf01103064d2b37..8b84626f0892ab2c5e8bad5e4da29d3910dd990e 100644 (file)
--- 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 6813f0285bd3286cf8231d50321dea5c0ea2cde0..6bdbb9aa371b64c1814b35a1a1ad08897cb36cec 100644 (file)
--- 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 8dd37942db179f5bcef7919bdfa1f2edba10d6ba..6ec24635840bb38e4a5e1623a958eff25918c8fa 100644 (file)
--- 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"