summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/qemu/qemu.SlackBuild18
-rw-r--r--system/qemu/qemu.info6
2 files changed, 12 insertions, 12 deletions
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 3b9f7888eb..30463c962c 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -29,9 +29,10 @@
# rworkman and ponce for script ideas.
# 1.1 28-MAR-2013 fix missing docs per C. Willing and
# add missing --libdir (patched in qemu-trivial upstream)
+# 1.2 22-SEP-2013 updated to 1.6
PRGNAM=qemu
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.6.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -113,12 +114,14 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
+ --localstatedir=/var \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --enable-gtk \
--enable-system \
--enable-kvm \
--enable-mixemu \
--disable-debug-info \
--audio-drv-list=alsa,oss,sdl,esd \
- --audio-card-list=ac97,es1370,sb16,cs4231a,adlib,gus,hda \
$targets \
$with_spice \
$with_usbredir
@@ -136,6 +139,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
# create a symlink for qemu-kvm to support aqemu and such frontends
+# even though qemu now has a gtk gui.
[ ! -z $KVMARCH ] && ln -s qemu-system-$KVMARCH $PKG/usr/bin/qemu-kvm
# move any generated man pages to their proper location
@@ -144,14 +148,10 @@ if [ -d $PKG/usr/share/man ]; then
gzip -9 $PKG/usr/man/man?/*.?
fi
-# Add docs, and if present, built documentation to the proper location
+# Add docs to the proper location
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a TODO README LICENSE COPYING COPYING.LIB MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-if [ -d $PKG/usr/share/doc ]; then
- mv $PKG/usr/share/doc/qemu/* $PKG/usr/doc/$PRGNAM-$VERSION/
- rm -rf $PKG/usr/share/doc
-fi
+cp -a Changelog COPYING* LICENSE MAINTAINERS README qemu-*.html docs/* \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index e7d33915ca..76b8a69a58 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
PRGNAM="qemu"
-VERSION="1.4.0"
+VERSION="1.6.0"
HOMEPAGE="http://wiki.qemu.org/Main_Page"
-DOWNLOAD="http://wiki.qemu.org/download/qemu-1.4.0.tar.bz2"
-MD5SUM="78f13b774814b6b7ebcaf4f9b9204318"
+DOWNLOAD="http://wiki.qemu.org/download/qemu-1.6.0.tar.bz2"
+MD5SUM="f3f39308472d629aca57a255a0c91ba9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""