diff options
| -rw-r--r-- | system/qemu/README | 3 | ||||
| -rw-r--r-- | system/qemu/qemu.SlackBuild | 37 | ||||
| -rw-r--r-- | system/qemu/qemu.info | 8 |
3 files changed, 35 insertions, 13 deletions
diff --git a/system/qemu/README b/system/qemu/README index 2f079cb0ee..1382146ef9 100644 --- a/system/qemu/README +++ b/system/qemu/README @@ -40,4 +40,5 @@ NOTES: This version breaks some backward compatibility with earlier versions. Consult the official changelogs for details. - To enable USB passthrough, you will need libusb >= 1.0.13 + Slackware's libusb is too old. Thus, to enable usb redirection, install + usbredir and build with LIBUSB=yes ./qemu.SlackBuild diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index f529088de5..94078d014a 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -37,9 +37,10 @@ # 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 # 1.6a 23-NOV-2014 added overlooked AUDIODRIVERS switch per SBo list +# 1.7 01-JAN-2015 updated to 2.2.0 ; build and link static libusb option (rw, tm, SBo list) PRGNAM=qemu -VERSION=${VERSION:-2.1.2} +VERSION=${VERSION:-2.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -47,6 +48,7 @@ KVMGROUP=${KVMGROUP:-users} TARGETS=${TARGETS:-some} VNC_ENABLE=${VNC_ENABLE:-yes} AUDIODRIVERS=${AUDIODRIVERS:-alsa,oss,sdl,esd} +LIBUSB=${LIBUSB:-no} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -114,6 +116,26 @@ else with_vnc="--disable-vnc" fi +# Build libusb-1.0.19 statically so that usb passthrough will work; +# not needed if you upgrade the default libdir. +USBSTATIC="" +if [ "$LIBUSB" = "yes" ]; then + tar xf $CWD/libusb-1.0.19.tar.xz + cd libusb-1.0.19 + CFLAGS="$SLKCFLAGS" \ + ./configure \ + --prefix=$TMP/$PRGNAM-$VERSION/libusb-static \ + --build=$ARCH-slackware-linux \ + --disable-shared \ + --enable-static + make install + cd .. + sed -i 's/--cflags libusb-1.0/\0 --static/' configure + sed -i 's/--libs libusb-1.0/\0 --static/' configure + USBSTATIC="$TMP/$PRGNAM-$VERSION/libusb-static/lib/pkgconfig" +fi + +PKG_CONFIG_PATH+="${USBSTATIC}" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -132,17 +154,15 @@ CXXFLAGS="$SLKCFLAGS" \ $with_vnc \ $targets -#usb passthrough may fail since Slackware's libusb is too old. -# other useful options: -# --enable-vde enable support for vde network -# --enable-libnfs enable nfs support -# --enable-vde enable support for vde network -# --enable-bluez enable bluez stack connectivity +# Make these first; otherwise make won't run in parallel. +make config-all-devices.mak config-all-disas.mak make V=1 - make install DESTDIR=$PKG +# Remove empty /var +rm -rf $PKG/var/run + # install some udev rules for /dev/kvm mkdir -p $PKG/lib/udev/rules.d/ sed "s/@GROUP@/$KVMGROUP/" $CWD/65-kvm.rules \ @@ -165,7 +185,6 @@ fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a Changelog COPYING* CODING_STYLE HACKING LICENSE MAINTAINERS README qemu-*.html docs/* \ $PKG/usr/doc/$PRGNAM-$VERSION - cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info index 26d082220e..8db28aa061 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -1,8 +1,10 @@ PRGNAM="qemu" -VERSION="2.1.2" +VERSION="2.2.0" HOMEPAGE="http://wiki.qemu.org/Main_Page" -DOWNLOAD="http://wiki.qemu.org/download/qemu-2.1.2.tar.bz2" -MD5SUM="0ff197c4ed4b695620bc4734e77c888f" +DOWNLOAD="http://wiki.qemu.org/download/qemu-2.2.0.tar.bz2 \ + http://harrier.slackbuilds.org/misc/libusb-1.0.19.tar.xz" +MD5SUM="f7a5e2da22d057eb838a91da7aff43c8 \ + 30fcf0865e8945a39d7d136f907e933c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |