From 33419011e2741f097ee2c60f3fed649a9cae707c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 5 Sep 2014 15:52:57 +0200 Subject: [PATCH] qemu: add sdl2 opt; replace sdl1 opt with sdl and make it the default. --- srcpkgs/qemu/template | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 2d36bde1ff..df55103700 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,7 +1,7 @@ # Template file for 'qemu' pkgname=qemu version=2.1.0 -revision=6 +revision=7 short_desc="Open Source Processor Emulator" maintainer="Juan RP " homepage="http://qemu.org" @@ -16,14 +16,15 @@ makedepends="libpng-devel>=1.6 libjpeg-turbo-devel pixman-devel 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 sdl1 SDL-devel SDL2-devel) $(vopt_if gtk gtk+-devel)" + $(vopt_if sdl SDL-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if gtk gtk+-devel)" depends="libusb>=1.0.15" conf_files="/etc/qemu/target-x86_64.conf" -build_options="gtk sdl1" -build_options_default="sdl1" +build_options="gtk sdl sdl2" +build_options_default="sdl" desc_option_gtk="Enable GTK display and use it by default" -desc_option_sdl1="Link against SDL1 instead of SDL2" +desc_option_sdl="Use SDL (1.x) video output" +desc_option_sdl2="Use SDL (2.x) video output" do_configure() { local args= @@ -41,7 +42,9 @@ do_configure() { --enable-vhost-net --enable-vnc-png --enable-vnc-tls --enable-virtfs \ --enable-libusb --disable-glusterfs \ --enable-pie --localstatedir=/var \ - --with-sdlabi=$(vopt_if sdl1 1.0 2.0) $(vopt_enable gtk) ${args} + $(vopt_if sdl "--with-sdlabi=1.0") \ + $(vopt_if sdl2 "--with-sdlabi=2.0") \ + $(vopt_enable gtk) ${args} } do_build() { if [ "$CROSS_BUILD" ]; then