diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2016-01-02 23:58:45 -0600 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | 83cbc71ea2b02e9ab3108fa20b42b4d6c2cbe063 (patch) | |
| tree | d6db0bbcf36514c73a0d3cbdb87c656e6ea7f0fc | |
| parent | 6db532a65a8bd39abdf18d512f70457a6d84490c (diff) | |
| download | slackbuilds-83cbc71ea2b02e9ab3108fa20b42b4d6c2cbe063.tar.gz | |
system/qemu: Kill static libusb support (not needed with 14.2)
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/qemu/README | 3 | ||||
| -rw-r--r-- | system/qemu/qemu.SlackBuild | 21 | ||||
| -rw-r--r-- | system/qemu/qemu.info | 6 |
3 files changed, 2 insertions, 28 deletions
diff --git a/system/qemu/README b/system/qemu/README index 40f31add29..a80da713e0 100644 --- a/system/qemu/README +++ b/system/qemu/README @@ -39,6 +39,3 @@ If you wish to emulate ARM, you will want device-tree-compiler. NOTES: This version breaks some backward compatibility with earlier versions. Consult the official changelogs for details. - - Slackware's libusb is too old. Thus, to enable usb redirection, install - usbredir, download libusb-1.19, and build with LIBUSB=yes ./qemu.SlackBuild diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index 088892736f..26e3cac2a9 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -54,7 +54,6 @@ KVMGROUP=${KVMGROUP:-users} TARGETS=${TARGETS:-some} VNC_ENABLE=${VNC_ENABLE:-yes} AUDIODRIVERS=${AUDIODRIVERS:-alsa,oss,sdl} -LIBUSB=${LIBUSB:-no} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -122,26 +121,6 @@ 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 \ diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info index 7c665bc84f..fd916e87d2 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -1,10 +1,8 @@ PRGNAM="qemu" VERSION="2.5.0" HOMEPAGE="http://wiki.qemu.org/Main_Page" -DOWNLOAD="http://wiki.qemu-project.org/download/qemu-2.5.0.tar.bz2 \ - http://harrier.slackbuilds.org/misc/libusb-1.0.19.tar.xz" -MD5SUM="f469f2330bbe76e3e39db10e9ac4f8db \ - 30fcf0865e8945a39d7d136f907e933c" +DOWNLOAD="http://wiki.qemu-project.org/download/qemu-2.5.0.tar.bz2" +MD5SUM="f469f2330bbe76e3e39db10e9ac4f8db" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |