system/qemu: Updated for version 2.1.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 15 insertions, 41 deletions

diff --git a/system/qemu/README b/system/qemu/README
index 5b84ba720c2ca..2f079cb0ee2b5 100644
--- a/system/qemu/README
+++ b/system/qemu/README
@@ -14,9 +14,13 @@ for qemu; if you prefer to build all supported targets, do this:
 
   TARGETS=all ./qemu.SlackBuild
 
-Add optional vnc support via:
+Disable vnc support via:
 
-  VNC_ENABLE=yes ./qemu.SlackBuild
+  VNC_ENABLE=no ./qemu.SlackBuild
+
+Audio drivers support defaults to "alsa,oss,sdl,esd" and can be adusted via
+
+AUDIODRIVERS="alsa,oss" ./qemu.SlackBuild
 
 We patch the installed udev rules to require membership in "users" 
 group instead of a custom "kvm" group to use /dev/kvm.  If you prefer
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index fb68176211ade..31a6f07569cd7 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -35,15 +35,16 @@
 #                       clean ups, libusb version check.
 # 1.4a  04-MAY-2014     fixed typos thanks to sandb0y
 # 1.5   10-AUG-2014	updated to new version, watch for legacy "gotchas"
+# 1.6	18-NOV-2014	updated version, last of the 2.1 series, changed defaults per SBo list
 
 PRGNAM=qemu
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 KVMGROUP=${KVMGROUP:-users}
 TARGETS=${TARGETS:-some}
-VNC_ENABLE=${VNC_ENABLE:-no}
+VNC_ENABLE=${VNC_ENABLE:-yes}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -104,40 +105,13 @@ else
   targets="--target-list=i386-softmmu,x86_64-softmmu,i386-linux-user,x86_64-linux-user,arm-softmmu,arm-linux-user,armeb-linux-user"
 fi
 
-# Optional VNC support for those who want it (adjust options as needed); use VNC_ENABLE=yes
+# To omit VNC capability, use VNC_ENABLE=no
 if [ "$VNC_ENABLE" = "yes" ]; then
   with_vnc="--enable-vnc --enable-vnc-tls --enable-vnc-jpeg"
 else
   with_vnc="--disable-vnc"
 fi
 
-# Slackware-14.1 ships with an ancient libusb. Check for updates to enable.
-if pkg-config --atleast-version=1.0.13 libusb-1.0 ; then
-  with_libusb="--enable-libusb"
-  echo
-else
-  with_libusb="--disable-libusb"
-fi
-
-# check if spice is there
-if pkg-config --exists spice-server ; then
-  with_spice="--enable-spice"
-else
-  with_spice="--disable-spice"
-fi
-
-# check if usbredir is there
-if pkg-config --exists libusbredirhost ; then
-  with_usbredir="--enable-usb-redir"
-else
-  with_usbredir="--disable-usb-redir"
-fi
-
-# check if device-tree-compiler is installed. Some targets need this so consider installing it from SBo.
-if ls /var/log/packages/device-tree-compiler-* 1>/dev/null 2>/dev/null ; then
-  with_fdt="--enable-fdt"
-fi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -153,12 +127,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-virtfs \
   --enable-sdl \
   --audio-drv-list=alsa,oss,sdl,esd \
-  $with_libusb \
   $with_vnc \
-  $targets \
-  $with_spice \
-  $with_usbredir \
-  $with_fdt
+  $targets
 
 #usb passthrough may fail since Slackware's libusb is too old.
 # other useful options:
@@ -167,7 +137,7 @@ CXXFLAGS="$SLKCFLAGS" \
 # --enable-vde             enable support for vde network
 # --enable-bluez           enable bluez stack connectivity
 
-make V=1 OS_CFLAGS="$SLKCFLAGS"
+make V=1
 
 make install DESTDIR=$PKG
 
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index 9dbaaf00a6ce1..26d082220ebb4 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
 PRGNAM="qemu"
-VERSION="2.1.0"
+VERSION="2.1.2"
 HOMEPAGE="http://wiki.qemu.org/Main_Page"
-DOWNLOAD="http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2"
-MD5SUM="6726977292b448cbc7f89998fac6983b"
+DOWNLOAD="http://wiki.qemu.org/download/qemu-2.1.2.tar.bz2"
+MD5SUM="0ff197c4ed4b695620bc4734e77c888f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""