From eea9aa4bd00c1a31f61dbe5ab155a7bd3f912522 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 29 Dec 2014 16:45:17 +0100 Subject: [PATCH] qemu: added spice build option (enabled on x86); enable aio/snappy/libnfs support. --- srcpkgs/qemu/template | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 3b044a05d37..b98df48815d 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,7 +1,7 @@ # Template file for 'qemu' pkgname=qemu version=2.2.0 -revision=1 +revision=2 short_desc="Open Source Processor Emulator" maintainer="Juan RP " homepage="http://qemu.org" @@ -11,21 +11,27 @@ checksum=b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c nostrip=yes hostmakedepends="pkg-config perl python automake libtool flex" -makedepends="libpng-devel>=1.6 libjpeg-turbo-devel pixman-devel - libuuid-devel libX11-devel alsa-lib-devel gnutls-devel>=3.1.5 +makedepends="libpng-devel>=1.6 libjpeg-turbo-devel pixman-devel snappy-devel + libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel>=3.1.5 libsasl-devel libglib-devel ncurses-devel libseccomp-devel>=2.1.0 nss-devel libcurl-devel xfsprogs-devel libcap-ng-devel libcap-devel vde2-devel - libbluetooth-devel libssh2-devel libusb-devel pulseaudio-devel - $(vopt_if sdl SDL-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if gtk gtk+-devel)" + libbluetooth-devel libssh2-devel libusb-devel pulseaudio-devel libnfs-devel + $(vopt_if sdl SDL-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if gtk gtk+-devel) + $(vopt_if spice spice-devel)" conf_files="/etc/qemu/target-x86_64.conf" -build_options="gtk sdl sdl2" +build_options="gtk sdl sdl2 spice" build_options_default="sdl" desc_option_gtk="Enable GTK display and use it by default" desc_option_sdl="Use SDL (1.x) video output" desc_option_sdl2="Use SDL (2.x) video output" +desc_option_spice="Enable support for SPICE" vopt_conflict "sdl" "sdl2" +case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*) build_options_default+=" spice";; +esac + do_configure() { local args= @@ -42,8 +48,8 @@ do_configure() { ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec \ --enable-kvm --audio-drv-list=alsa,sdl,pa --disable-xen --enable-tpm \ --enable-vhost-net --enable-vnc-png --enable-vnc-tls --enable-virtfs \ - --enable-libusb --disable-glusterfs \ - --enable-pie --localstatedir=/var \ + --enable-libusb --disable-glusterfs --enable-snappy \ + --enable-pie --localstatedir=/var $(vopt_enable spice) \ $(vopt_if sdl "--with-sdlabi=1.0") \ $(vopt_if sdl2 "--with-sdlabi=2.0") \ $(vopt_enable gtk) ${args}