[Lunar-commits] <moonbase> qemu-kvm: Sound, SDL and bluetooth are now optional

[Stefan Wold]

commit eff5480c0382f62494b63817db7267b38df2ff88
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sat Jun 18 10:31:09 2011 +0200

    qemu-kvm: Sound, SDL and bluetooth are now optional
    
    - Removed CONFIGURE, not needed for qemu-kvm
---
 virtual/qemu-kvm/BUILD     |    9 +++++++--
 virtual/qemu-kvm/CONFIGURE |   37 -------------------------------------
 virtual/qemu-kvm/DEPENDS   |   10 ++++++----
 3 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/virtual/qemu-kvm/BUILD b/virtual/qemu-kvm/BUILD
index f70de08..bd11897 100644
--- a/virtual/qemu-kvm/BUILD
+++ b/virtual/qemu-kvm/BUILD
@@ -1,10 +1,15 @@
 (
+  
+  AUDIO_LIST="oss"
 
-  OPTS+=" --audio-drv-list=alsa,sdl,oss,esd \
-          --audio-card-list=ac97,sb16,es1370,adlib"
+  in_depends $MODULE alsa-lib && AUDIO_LIST+=" alsa"
+  in_depends $MODULE esound && AUDIO_LIST+=" esd"
+  in_depends $MODULE pulseaudio && AUDIO_LIST+=" pa"
+  in_depends $MODULE SDL && AUDIO_LIST+=" sdl"
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
+              --audio-drv-list="$AUDIO_LIST" \
               $OPTS &&
 
   default_make &&
diff --git a/virtual/qemu-kvm/CONFIGURE b/virtual/qemu-kvm/CONFIGURE
deleted file mode 100644
index 3b0a739..0000000
--- a/virtual/qemu-kvm/CONFIGURE
+++ /dev/null
@@ -1,37 +0,0 @@
-SUPPORTED_TARGETS="i386-softmmu x86_64-softmmu arm-softmmu cris-softmmu m68k-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu ppc-softmmu ppcemb-softmmu ppc64-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu i386-linux-user x86_64-linux-user alpha-linux-user arm-linux-user armeb-linux-user cris-linux-user m68k-linux-user mips-linux-user mipsel-linux-user ppc-linux-user ppc64-linux-user ppc64abi32-linux-user sh4-linux-user sh4eb-linux-user sparc-linux-user sparc64-linux-user sparc32plus-linux-user"
-
-make_targets_checklist() {
-  for target in $SUPPORTED_TARGETS; do
-    title=$target
-    echo "\"$target\" \"$title\" \"off\" "
-  done
-}
-
-select_targets() {
-  BACKTITLE="Qemu Target Configuration"
-      TITLE="Target Selection"
-       HELP="Select targes you want to build"
-  make_targets_checklist | xargs  \
-  dialog --backtitle "$BACKTITLE" \
-         --title     "$TITLE"     \
-         --stdout                 \
-         --separate-output        \
-         --checklist "$HELP"      \
-         0 0 0
-}
-
-if ! grep -q CONFIGURED $MODULE_CONFIG; then
-  if grep -q "TARGETLIST=" $MODULE_CONFIG; then
-    message "Selecting targets is optional"
-  fi
-
-  if query "Would you like to select arch targets? If not selected, all targets will be installed." y ; then
-    TARGETLIST=`select_targets`
-    TEMP=`grep -v "TARGETLIST="          $MODULE_CONFIG`
-    echo "$TEMP"                       > $MODULE_CONFIG
-    echo "TARGETLIST=\"$TARGETLIST\"" >> $MODULE_CONFIG
-  fi
-
-  echo "OPTS=\"\$OPTS $OPTS\"" >> $MODULE_CONFIG
-  echo "CONFIGURED=y"          >> $MODULE_CONFIG
-fi
diff --git a/virtual/qemu-kvm/DEPENDS b/virtual/qemu-kvm/DEPENDS
index fc9479e..46490fc 100644
--- a/virtual/qemu-kvm/DEPENDS
+++ b/virtual/qemu-kvm/DEPENDS
@@ -1,9 +1,11 @@
 depends %JPEG
 depends libpng
-depends curl
-depends SDL
-depends alsa-lib
-depends esound
 depends gnutls
 depends vde2
 depends perl
+optional_depends bluez "--enable-bluez" "--disable-bluez" "for bluetooth support"
+optional_depends curl "--enable-curl" "--disable-curl" "for curl support"
+optional_depends SDL "--enable-sdl" "--disable-sdl --disable-gfx-check" "for GUI support"
+optional_depends alsa-lib "" "" "for ALSA sound support"
+optional_depends esound "" "" "for esound sound support"
+optional_depends pulseaudio "" "" "for pulseaudio sound support"