From df3488f51a8c3fe1f7f615e16169e289564f45f3 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 18 Apr 2013 12:04:54 +0000 Subject: [PATCH] packages: consistently use 'depends on' instead of 'depends' make the syntax more compatible with kernel menuconfig Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/packages@36357 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- multimedia/ffmpeg/Config.in | 42 ++++++++++++++++----------------- multimedia/gst-ffmpeg/Config.in | 42 ++++++++++++++++----------------- multimedia/tvheadend/Config.in | 2 +- net/batman-adv/Config.in | 8 +++---- net/madwifi/Config.in | 2 +- utils/lcd4linux/Config.in | 10 ++++---- 6 files changed, 53 insertions(+), 53 deletions(-) diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in index fcd2124e8..461926d95 100644 --- a/multimedia/ffmpeg/Config.in +++ b/multimedia/ffmpeg/Config.in @@ -1,5 +1,5 @@ menu "Configuration" - depends PACKAGE_libffmpeg-custom + depends on PACKAGE_libffmpeg-custom config FFMPEG_CUSTOM_PATENTED bool "Include patented codecs and technologies" @@ -16,7 +16,7 @@ config FFMPEG_CUSTOM_FFSERVER_SUPPORT config FFMPEG_CUSTOM_LIBDLNA_SUPPORT bool "Include support for libdlna/ushare" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED select FFMPEG_CUSTOM_DECODER_ac3 select FFMPEG_CUSTOM_DECODER_atrac3 select FFMPEG_CUSTOM_DECODER_h264 @@ -36,7 +36,7 @@ config FFMPEG_CUSTOM_LIBDLNA_SUPPORT config FFMPEG_CUSTOM_MINIDLNA_SUPPORT bool "Include support for minidlna" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED select FFMPEG_CUSTOM_DECODER_aac select FFMPEG_CUSTOM_DECODER_ac3 select FFMPEG_CUSTOM_DECODER_flac @@ -65,7 +65,7 @@ comment "Encoders ---" config FFMPEG_CUSTOM_ENCODER_ac3 bool "AC3" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED select FFMPEG_CUSTOM_PARSER_ac3 config FFMPEG_CUSTOM_ENCODER_jpegls @@ -76,11 +76,11 @@ config FFMPEG_CUSTOM_ENCODER_mpeg1video config FFMPEG_CUSTOM_ENCODER_mpeg2video bool "MPEG-2 Video" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_ENCODER_mpeg4 bool "MPEG-4" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_ENCODER_pcm_s16be bool "PCM signed 16-bit big-endian" @@ -102,17 +102,17 @@ comment "Decoders ---" config FFMPEG_CUSTOM_DECODER_aac bool "AAC (Advanced Audio Coding)" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED select FFMPEG_CUSTOM_PARSER_aac config FFMPEG_CUSTOM_DECODER_ac3 bool "AC3" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED select FFMPEG_CUSTOM_PARSER_ac3 config FFMPEG_CUSTOM_DECODER_atrac3 bool "ATRAC3" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_DECODER_flac bool "FLAC" @@ -122,18 +122,18 @@ config FFMPEG_CUSTOM_DECODER_gif config FFMPEG_CUSTOM_DECODER_h264 bool "H.264" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_DECODER_jpegls bool "JPEG-LS" config FFMPEG_CUSTOM_DECODER_mp2 bool "MP2 (MPEG Audio Layer 2)" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_DECODER_mp3 bool "MP3 (MPEG Audio Layer 2)" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_DECODER_mpegvideo bool "MPEG Video" @@ -143,11 +143,11 @@ config FFMPEG_CUSTOM_DECODER_mpeg1video config FFMPEG_CUSTOM_DECODER_mpeg2video bool "MPEG-2 Video" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_DECODER_mpeg4 bool "MPEG-4" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_DECODER_pcm_s16be bool "PCM signed 16-bit big-endian" @@ -164,11 +164,11 @@ config FFMPEG_CUSTOM_DECODER_vorbis config FFMPEG_CUSTOM_DECODER_wmav1 bool "WMAv1" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_DECODER_wmav2 bool "WMAv2" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_DECODER_zlib bool "Zlib" @@ -177,14 +177,14 @@ comment "Muxers ---" config FFMPEG_CUSTOM_MUXER_ac3 bool "AC3" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_MUXER_ffm bool "FFM (ffserver live feed)" config FFMPEG_CUSTOM_MUXER_h264 bool "H.264" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_MUXER_mp3 bool "MP3 (MPEG Audio Layer 3)" @@ -226,7 +226,7 @@ config FFMPEG_CUSTOM_DEMUXER_ffm config FFMPEG_CUSTOM_DEMUXER_h264 bool "H.264" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_DEMUXER_matroska bool "Matroska (MKA,MKV)" @@ -270,14 +270,14 @@ comment "Parsers ---" config FFMPEG_CUSTOM_PARSER_aac bool "AAC (Advanced Audio Coding)" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED config FFMPEG_CUSTOM_PARSER_ac3 bool "AC3" config FFMPEG_CUSTOM_PARSER_h264 bool "H.264" - depends FFMPEG_CUSTOM_PATENTED + depends on FFMPEG_CUSTOM_PATENTED select FFMPEG_CUSTOM_DECODER_h264 config FFMPEG_CUSTOM_PARSER_mpegaudio diff --git a/multimedia/gst-ffmpeg/Config.in b/multimedia/gst-ffmpeg/Config.in index 9f579c7c1..3a0cfbb43 100644 --- a/multimedia/gst-ffmpeg/Config.in +++ b/multimedia/gst-ffmpeg/Config.in @@ -1,5 +1,5 @@ menu "Configuration" - depends PACKAGE_gst-ffmpeg + depends on PACKAGE_gst-ffmpeg config GST_FFMPEG_IPV6 bool "Enable IPv6" @@ -11,7 +11,7 @@ config GST_FFMPEG_PATENTED config GET_FFMPEG_LIBDLNA_SUPPORT bool "Include support for libdlna/ushare" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED select GST_FFMPEG_DECODER_ac3 select GST_FFMPEG_DECODER_atrac3 select GST_FFMPEG_DECODER_h264 @@ -34,7 +34,7 @@ comment "Encoders ---" config GST_FFMPEG_ENCODER_ac3 bool "AC3" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED select GST_FFMPEG_PARSER_ac3 config GST_FFMPEG_ENCODER_jpegls @@ -45,11 +45,11 @@ config GST_FFMPEG_ENCODER_mpeg1video config GST_FFMPEG_ENCODER_mpeg2video bool "MPEG-2 Video" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_ENCODER_mpeg4 bool "MPEG-4" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_ENCODER_pcm_s16be bool "PCM signed 16-bit big-endian" @@ -71,35 +71,35 @@ comment "Decoders ---" config GST_FFMPEG_DECODER_aac bool "AAC (Advanced Audio Coding)" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED select GST_FFMPEG_PARSER_aac config GST_FFMPEG_DECODER_ac3 bool "AC3" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED select GST_FFMPEG_PARSER_ac3 config GST_FFMPEG_DECODER_atrac3 bool "ATRAC3" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_DECODER_gif bool "GIF" config GST_FFMPEG_DECODER_h264 bool "H.264" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_DECODER_jpegls bool "JPEG-LS" config GST_FFMPEG_DECODER_mp2 bool "MP2 (MPEG Audio Layer 2)" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_DECODER_mp3 bool "MP3 (MPEG Audio Layer 2)" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_DECODER_mpegvideo bool "MPEG Video" @@ -109,15 +109,15 @@ config GST_FFMPEG_DECODER_mpeg1video config GST_FFMPEG_DECODER_mpeg2video bool "MPEG-2 Video" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_DECODER_mpeg4 bool "MPEG-4" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_DECODER_mpeg4aac bool "MPEG-4 (AAC)" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_DECODER_pcm_s16be bool "PCM signed 16-bit big-endian" @@ -134,11 +134,11 @@ config GST_FFMPEG_DECODER_vorbis config GST_FFMPEG_DECODER_wmav1 bool "WMAv1" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_DECODER_wmav2 bool "WMAv2" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_DECODER_zlib bool "Zlib" @@ -147,14 +147,14 @@ comment "Muxers ---" config GST_FFMPEG_MUXER_ac3 bool "AC3" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_MUXER_ffm bool "FFM (ffserver live feed)" config GST_FFMPEG_MUXER_h264 bool "H.264" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_MUXER_mp3 bool "MP3 (MPEG Audio Layer 3)" @@ -190,7 +190,7 @@ config GST_FFMPEG_DEMUXER_ffm config GST_FFMPEG_DEMUXER_h264 bool "H.264" - depends FFMPEG_PATENTED + depends on FFMPEG_PATENTED config GST_FFMPEG_DEMUXER_mp3 bool "MP3 (MPEG Audio Layer 3)" @@ -225,14 +225,14 @@ comment "Parsers ---" config GST_FFMPEG_PARSER_aac bool "AAC (Advanced Audio Coding)" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED config GST_FFMPEG_PARSER_ac3 bool "AC3" config GST_FFMPEG_PARSER_h264 bool "H.264" - depends GST_FFMPEG_PATENTED + depends on GST_FFMPEG_PATENTED select GST_FFMPEG_DECODER_h264 config GST_FFMPEG_PARSER_mpegaudio diff --git a/multimedia/tvheadend/Config.in b/multimedia/tvheadend/Config.in index 52c018fe6..e769aa821 100644 --- a/multimedia/tvheadend/Config.in +++ b/multimedia/tvheadend/Config.in @@ -12,7 +12,7 @@ config TVHEADEND_LINUXDVB_SUPPORT config TVHEADEND_DVBSCAN_SUPPORT bool "Fetch DVB-scan data" - depends TVHEADEND_LINUXDVB_SUPPORT + depends on TVHEADEND_LINUXDVB_SUPPORT default TVHEADEND_LINUXDVB_SUPPORT config TVHEADEND_AVAHI_SUPPORT diff --git a/net/batman-adv/Config.in b/net/batman-adv/Config.in index 08987e5cc..b47104fca 100644 --- a/net/batman-adv/Config.in +++ b/net/batman-adv/Config.in @@ -1,22 +1,22 @@ config KMOD_BATMAN_ADV_DEBUG_LOG bool "enable verbose debug logging" - depends PACKAGE_kmod-batman-adv + depends on PACKAGE_kmod-batman-adv default n config KMOD_BATMAN_ADV_BLA bool "enable bridge loop avoidance" - depends PACKAGE_kmod-batman-adv + depends on PACKAGE_kmod-batman-adv default y config KMOD_BATMAN_ADV_DAT bool "enable distributed arp table" - depends PACKAGE_kmod-batman-adv + depends on PACKAGE_kmod-batman-adv default y config KMOD_BATMAN_ADV_BATCTL bool "enable batctl" - depends PACKAGE_kmod-batman-adv + depends on PACKAGE_kmod-batman-adv default y help batctl is a more intuitive managment utility for B.A.T.M.A.N.-Advanced. diff --git a/net/madwifi/Config.in b/net/madwifi/Config.in index 7b72eb854..e9f93d7b7 100644 --- a/net/madwifi/Config.in +++ b/net/madwifi/Config.in @@ -8,7 +8,7 @@ config MADWIFI_DEBUG config MADWIFI_COMPRESSION bool "Enable Atheros Super A/G Compression" - depends !TARGET_ar71xx + depends on !TARGET_ar71xx default n help Enables Atheros Super A/G Hardware Compression Engine. diff --git a/utils/lcd4linux/Config.in b/utils/lcd4linux/Config.in index 2453a3ca9..617521c1f 100644 --- a/utils/lcd4linux/Config.in +++ b/utils/lcd4linux/Config.in @@ -125,12 +125,12 @@ config LCD4LINUX_CUSTOM_DRIVER_GLCD2USB config LCD4LINUX_CUSTOM_DRIVER_HD44780 bool prompt "HD44780" - depends BROKEN + depends on BROKEN config LCD4LINUX_CUSTOM_DRIVER_HD44780-I2C bool prompt "HD44780-I2C" - depends BROKEN + depends on BROKEN config LCD4LINUX_CUSTOM_DRIVER_IRLCD bool @@ -146,7 +146,7 @@ config LCD4LINUX_CUSTOM_DRIVER_LCD2USB config LCD4LINUX_CUSTOM_DRIVER_LCDLinux bool prompt "LCDLinux" - depends BROKEN + depends on BROKEN config LCD4LINUX_CUSTOM_DRIVER_LCDTerm bool @@ -167,7 +167,7 @@ config LCD4LINUX_CUSTOM_DRIVER_LUIse prompt "LUIse" select LCD4LINUX_CUSTOM_NEEDS_libgd #select LCD4LINUX_CUSTOM_NEEDS_libluise - depends BROKEN + depends on BROKEN config LCD4LINUX_CUSTOM_DRIVER_LW_ABP bool @@ -492,7 +492,7 @@ config LCD4LINUX_CUSTOM_PLUGIN_w1retap config LCD4LINUX_CUSTOM_PLUGIN_wireless bool prompt "wireless" - depends BROKEN + depends on BROKEN config LCD4LINUX_CUSTOM_PLUGIN_xmms bool