From 76235a15b37bae9e3c83bc20e9afd49a66e33455 Mon Sep 17 00:00:00 2001 From: Daniel Laird Date: Fri, 5 Sep 2008 12:06:50 +0000 Subject: [PATCH] audio: Move all audio packages into audio subdir Moved all audio packages into a subdir called audio. I then created a Config.in and made sure that a audio.mk existed. Daniel Laird --- package/Config.in | 23 ++----------------- package/audio/Config.in | 21 +++++++++++++++++ package/{ => audio}/alsa-lib/Config.in | 0 package/{ => audio}/alsa-lib/alsa-lib.mk | 0 package/{ => audio}/alsa-utils/Config.in | 0 package/{ => audio}/alsa-utils/alsa-utils.mk | 0 package/{ => audio}/asterisk/Config.in | 0 package/{ => audio}/asterisk/asterisk.mk | 0 .../asterisk/asterisk_no_res_ninit.patch | 0 package/audio/audio.mk | 1 + package/{ => audio}/aumix/Config.in | 0 package/{ => audio}/aumix/aumix.mk | 0 package/{ => audio}/festival/Config.in | 0 package/{ => audio}/festival/festival.mk | 0 .../festival/festival-1.96-beta-doc.patch | 0 .../festival-1.96-beta-etcsiteinit.patch | 0 .../festival/festival-1.96-beta-libdir.patch | 0 .../festival-1.96-beta-speechtools-dir.patch | 0 .../{ => audio}/festival/festival/festival.mk | 0 .../{ => audio}/festival/lexicons/Config.in | 0 .../{ => audio}/festival/lexicons/festlex.mk | 0 .../festival/speech-tools/Config.in | 0 .../speech-tools-1.2.96-beta-install.patch | 0 .../festival/speech-tools/speech-tools.mk | 0 package/{ => audio}/festival/voices/Config.in | 0 .../{ => audio}/festival/voices/festvox.mk | 0 package/{ => audio}/libid3tag/Config.in | 0 package/{ => audio}/libid3tag/libid3tag.mk | 0 package/{ => audio}/libmad/Config.in | 0 .../libmad-0.15.1b-optimization.patch.avr32 | 0 package/{ => audio}/libmad/libmad.mk | 0 package/{ => audio}/libogg/Config.in | 0 package/{ => audio}/libogg/libogg.mk | 0 package/{ => audio}/libsndfile/Config.in | 0 .../libsndfile/libsndfile-srconly.patch | 0 package/{ => audio}/libsndfile/libsndfile.mk | 0 package/{ => audio}/libvorbis/Config.in | 0 package/{ => audio}/libvorbis/libvorbis.mk | 0 package/{ => audio}/madplay/Config.in | 0 package/{ => audio}/madplay/madplay.mk | 0 package/{ => audio}/mpg123/Config.in | 0 .../mpg123/mpg123-0.59r-cross.patch | 0 package/{ => audio}/mpg123/mpg123.mk | 0 package/{ => audio}/speex/Config.in | 0 package/{ => audio}/speex/speex.mk | 0 45 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 package/audio/Config.in rename package/{ => audio}/alsa-lib/Config.in (100%) rename package/{ => audio}/alsa-lib/alsa-lib.mk (100%) rename package/{ => audio}/alsa-utils/Config.in (100%) rename package/{ => audio}/alsa-utils/alsa-utils.mk (100%) rename package/{ => audio}/asterisk/Config.in (100%) rename package/{ => audio}/asterisk/asterisk.mk (100%) rename package/{ => audio}/asterisk/asterisk_no_res_ninit.patch (100%) create mode 100644 package/audio/audio.mk rename package/{ => audio}/aumix/Config.in (100%) rename package/{ => audio}/aumix/aumix.mk (100%) rename package/{ => audio}/festival/Config.in (100%) rename package/{ => audio}/festival/festival.mk (100%) rename package/{ => audio}/festival/festival/festival-1.96-beta-doc.patch (100%) rename package/{ => audio}/festival/festival/festival-1.96-beta-etcsiteinit.patch (100%) rename package/{ => audio}/festival/festival/festival-1.96-beta-libdir.patch (100%) rename package/{ => audio}/festival/festival/festival-1.96-beta-speechtools-dir.patch (100%) rename package/{ => audio}/festival/festival/festival.mk (100%) rename package/{ => audio}/festival/lexicons/Config.in (100%) rename package/{ => audio}/festival/lexicons/festlex.mk (100%) rename package/{ => audio}/festival/speech-tools/Config.in (100%) rename package/{ => audio}/festival/speech-tools/speech-tools-1.2.96-beta-install.patch (100%) rename package/{ => audio}/festival/speech-tools/speech-tools.mk (100%) rename package/{ => audio}/festival/voices/Config.in (100%) rename package/{ => audio}/festival/voices/festvox.mk (100%) rename package/{ => audio}/libid3tag/Config.in (100%) rename package/{ => audio}/libid3tag/libid3tag.mk (100%) rename package/{ => audio}/libmad/Config.in (100%) rename package/{ => audio}/libmad/libmad-0.15.1b-optimization.patch.avr32 (100%) rename package/{ => audio}/libmad/libmad.mk (100%) rename package/{ => audio}/libogg/Config.in (100%) rename package/{ => audio}/libogg/libogg.mk (100%) rename package/{ => audio}/libsndfile/Config.in (100%) rename package/{ => audio}/libsndfile/libsndfile-srconly.patch (100%) rename package/{ => audio}/libsndfile/libsndfile.mk (100%) rename package/{ => audio}/libvorbis/Config.in (100%) rename package/{ => audio}/libvorbis/libvorbis.mk (100%) rename package/{ => audio}/madplay/Config.in (100%) rename package/{ => audio}/madplay/madplay.mk (100%) rename package/{ => audio}/mpg123/Config.in (100%) rename package/{ => audio}/mpg123/mpg123-0.59r-cross.patch (100%) rename package/{ => audio}/mpg123/mpg123.mk (100%) rename package/{ => audio}/speex/Config.in (100%) rename package/{ => audio}/speex/speex.mk (100%) diff --git a/package/Config.in b/package/Config.in index b8d81ba4bd..9568729ba0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -285,27 +285,8 @@ source "package/wipe/Config.in" source "package/xfsprogs/Config.in" endif -menuconfig BR2_AUDIO_SUPPORT - bool "Audio libraries and applications" - default y - help - Support for audio libraries and applications - -if BR2_AUDIO_SUPPORT -source "package/alsa-lib/Config.in" -source "package/alsa-utils/Config.in" -source "package/asterisk/Config.in" -source "package/aumix/Config.in" -source "package/libid3tag/Config.in" -source "package/libmad/Config.in" -source "package/libogg/Config.in" -source "package/libsndfile/Config.in" -source "package/libvorbis/Config.in" -source "package/madplay/Config.in" -source "package/mpg123/Config.in" -source "package/speex/Config.in" -source "package/festival/Config.in" -endif +# Audio support +source "package/audio/Config.in" menuconfig BR2_GRAPHIC_SUPPORT bool "Graphic libraries and applications (graphic/text)" diff --git a/package/audio/Config.in b/package/audio/Config.in new file mode 100644 index 0000000000..370467a2e7 --- /dev/null +++ b/package/audio/Config.in @@ -0,0 +1,21 @@ +menuconfig BR2_AUDIO_SUPPORT + bool "Audio libraries and applications" + default y + help + Support for audio libraries and applications + +if BR2_AUDIO_SUPPORT +source "package/audio/alsa-lib/Config.in" +source "package/audio/alsa-utils/Config.in" +source "package/audio/asterisk/Config.in" +source "package/audio/aumix/Config.in" +source "package/audio/libid3tag/Config.in" +source "package/audio/libmad/Config.in" +source "package/audio/libogg/Config.in" +source "package/audio/libsndfile/Config.in" +source "package/audio/libvorbis/Config.in" +source "package/audio/madplay/Config.in" +source "package/audio/mpg123/Config.in" +source "package/audio/speex/Config.in" +source "package/audio/festival/Config.in" +endif diff --git a/package/alsa-lib/Config.in b/package/audio/alsa-lib/Config.in similarity index 100% rename from package/alsa-lib/Config.in rename to package/audio/alsa-lib/Config.in diff --git a/package/alsa-lib/alsa-lib.mk b/package/audio/alsa-lib/alsa-lib.mk similarity index 100% rename from package/alsa-lib/alsa-lib.mk rename to package/audio/alsa-lib/alsa-lib.mk diff --git a/package/alsa-utils/Config.in b/package/audio/alsa-utils/Config.in similarity index 100% rename from package/alsa-utils/Config.in rename to package/audio/alsa-utils/Config.in diff --git a/package/alsa-utils/alsa-utils.mk b/package/audio/alsa-utils/alsa-utils.mk similarity index 100% rename from package/alsa-utils/alsa-utils.mk rename to package/audio/alsa-utils/alsa-utils.mk diff --git a/package/asterisk/Config.in b/package/audio/asterisk/Config.in similarity index 100% rename from package/asterisk/Config.in rename to package/audio/asterisk/Config.in diff --git a/package/asterisk/asterisk.mk b/package/audio/asterisk/asterisk.mk similarity index 100% rename from package/asterisk/asterisk.mk rename to package/audio/asterisk/asterisk.mk diff --git a/package/asterisk/asterisk_no_res_ninit.patch b/package/audio/asterisk/asterisk_no_res_ninit.patch similarity index 100% rename from package/asterisk/asterisk_no_res_ninit.patch rename to package/audio/asterisk/asterisk_no_res_ninit.patch diff --git a/package/audio/audio.mk b/package/audio/audio.mk new file mode 100644 index 0000000000..30f43b1dca --- /dev/null +++ b/package/audio/audio.mk @@ -0,0 +1 @@ +include package/audio/*/*.mk diff --git a/package/aumix/Config.in b/package/audio/aumix/Config.in similarity index 100% rename from package/aumix/Config.in rename to package/audio/aumix/Config.in diff --git a/package/aumix/aumix.mk b/package/audio/aumix/aumix.mk similarity index 100% rename from package/aumix/aumix.mk rename to package/audio/aumix/aumix.mk diff --git a/package/festival/Config.in b/package/audio/festival/Config.in similarity index 100% rename from package/festival/Config.in rename to package/audio/festival/Config.in diff --git a/package/festival/festival.mk b/package/audio/festival/festival.mk similarity index 100% rename from package/festival/festival.mk rename to package/audio/festival/festival.mk diff --git a/package/festival/festival/festival-1.96-beta-doc.patch b/package/audio/festival/festival/festival-1.96-beta-doc.patch similarity index 100% rename from package/festival/festival/festival-1.96-beta-doc.patch rename to package/audio/festival/festival/festival-1.96-beta-doc.patch diff --git a/package/festival/festival/festival-1.96-beta-etcsiteinit.patch b/package/audio/festival/festival/festival-1.96-beta-etcsiteinit.patch similarity index 100% rename from package/festival/festival/festival-1.96-beta-etcsiteinit.patch rename to package/audio/festival/festival/festival-1.96-beta-etcsiteinit.patch diff --git a/package/festival/festival/festival-1.96-beta-libdir.patch b/package/audio/festival/festival/festival-1.96-beta-libdir.patch similarity index 100% rename from package/festival/festival/festival-1.96-beta-libdir.patch rename to package/audio/festival/festival/festival-1.96-beta-libdir.patch diff --git a/package/festival/festival/festival-1.96-beta-speechtools-dir.patch b/package/audio/festival/festival/festival-1.96-beta-speechtools-dir.patch similarity index 100% rename from package/festival/festival/festival-1.96-beta-speechtools-dir.patch rename to package/audio/festival/festival/festival-1.96-beta-speechtools-dir.patch diff --git a/package/festival/festival/festival.mk b/package/audio/festival/festival/festival.mk similarity index 100% rename from package/festival/festival/festival.mk rename to package/audio/festival/festival/festival.mk diff --git a/package/festival/lexicons/Config.in b/package/audio/festival/lexicons/Config.in similarity index 100% rename from package/festival/lexicons/Config.in rename to package/audio/festival/lexicons/Config.in diff --git a/package/festival/lexicons/festlex.mk b/package/audio/festival/lexicons/festlex.mk similarity index 100% rename from package/festival/lexicons/festlex.mk rename to package/audio/festival/lexicons/festlex.mk diff --git a/package/festival/speech-tools/Config.in b/package/audio/festival/speech-tools/Config.in similarity index 100% rename from package/festival/speech-tools/Config.in rename to package/audio/festival/speech-tools/Config.in diff --git a/package/festival/speech-tools/speech-tools-1.2.96-beta-install.patch b/package/audio/festival/speech-tools/speech-tools-1.2.96-beta-install.patch similarity index 100% rename from package/festival/speech-tools/speech-tools-1.2.96-beta-install.patch rename to package/audio/festival/speech-tools/speech-tools-1.2.96-beta-install.patch diff --git a/package/festival/speech-tools/speech-tools.mk b/package/audio/festival/speech-tools/speech-tools.mk similarity index 100% rename from package/festival/speech-tools/speech-tools.mk rename to package/audio/festival/speech-tools/speech-tools.mk diff --git a/package/festival/voices/Config.in b/package/audio/festival/voices/Config.in similarity index 100% rename from package/festival/voices/Config.in rename to package/audio/festival/voices/Config.in diff --git a/package/festival/voices/festvox.mk b/package/audio/festival/voices/festvox.mk similarity index 100% rename from package/festival/voices/festvox.mk rename to package/audio/festival/voices/festvox.mk diff --git a/package/libid3tag/Config.in b/package/audio/libid3tag/Config.in similarity index 100% rename from package/libid3tag/Config.in rename to package/audio/libid3tag/Config.in diff --git a/package/libid3tag/libid3tag.mk b/package/audio/libid3tag/libid3tag.mk similarity index 100% rename from package/libid3tag/libid3tag.mk rename to package/audio/libid3tag/libid3tag.mk diff --git a/package/libmad/Config.in b/package/audio/libmad/Config.in similarity index 100% rename from package/libmad/Config.in rename to package/audio/libmad/Config.in diff --git a/package/libmad/libmad-0.15.1b-optimization.patch.avr32 b/package/audio/libmad/libmad-0.15.1b-optimization.patch.avr32 similarity index 100% rename from package/libmad/libmad-0.15.1b-optimization.patch.avr32 rename to package/audio/libmad/libmad-0.15.1b-optimization.patch.avr32 diff --git a/package/libmad/libmad.mk b/package/audio/libmad/libmad.mk similarity index 100% rename from package/libmad/libmad.mk rename to package/audio/libmad/libmad.mk diff --git a/package/libogg/Config.in b/package/audio/libogg/Config.in similarity index 100% rename from package/libogg/Config.in rename to package/audio/libogg/Config.in diff --git a/package/libogg/libogg.mk b/package/audio/libogg/libogg.mk similarity index 100% rename from package/libogg/libogg.mk rename to package/audio/libogg/libogg.mk diff --git a/package/libsndfile/Config.in b/package/audio/libsndfile/Config.in similarity index 100% rename from package/libsndfile/Config.in rename to package/audio/libsndfile/Config.in diff --git a/package/libsndfile/libsndfile-srconly.patch b/package/audio/libsndfile/libsndfile-srconly.patch similarity index 100% rename from package/libsndfile/libsndfile-srconly.patch rename to package/audio/libsndfile/libsndfile-srconly.patch diff --git a/package/libsndfile/libsndfile.mk b/package/audio/libsndfile/libsndfile.mk similarity index 100% rename from package/libsndfile/libsndfile.mk rename to package/audio/libsndfile/libsndfile.mk diff --git a/package/libvorbis/Config.in b/package/audio/libvorbis/Config.in similarity index 100% rename from package/libvorbis/Config.in rename to package/audio/libvorbis/Config.in diff --git a/package/libvorbis/libvorbis.mk b/package/audio/libvorbis/libvorbis.mk similarity index 100% rename from package/libvorbis/libvorbis.mk rename to package/audio/libvorbis/libvorbis.mk diff --git a/package/madplay/Config.in b/package/audio/madplay/Config.in similarity index 100% rename from package/madplay/Config.in rename to package/audio/madplay/Config.in diff --git a/package/madplay/madplay.mk b/package/audio/madplay/madplay.mk similarity index 100% rename from package/madplay/madplay.mk rename to package/audio/madplay/madplay.mk diff --git a/package/mpg123/Config.in b/package/audio/mpg123/Config.in similarity index 100% rename from package/mpg123/Config.in rename to package/audio/mpg123/Config.in diff --git a/package/mpg123/mpg123-0.59r-cross.patch b/package/audio/mpg123/mpg123-0.59r-cross.patch similarity index 100% rename from package/mpg123/mpg123-0.59r-cross.patch rename to package/audio/mpg123/mpg123-0.59r-cross.patch diff --git a/package/mpg123/mpg123.mk b/package/audio/mpg123/mpg123.mk similarity index 100% rename from package/mpg123/mpg123.mk rename to package/audio/mpg123/mpg123.mk diff --git a/package/speex/Config.in b/package/audio/speex/Config.in similarity index 100% rename from package/speex/Config.in rename to package/audio/speex/Config.in diff --git a/package/speex/speex.mk b/package/audio/speex/speex.mk similarity index 100% rename from package/speex/speex.mk rename to package/audio/speex/speex.mk -- 2.30.2