qemu: add sdl2 opt; replace sdl1 opt with sdl and make it the default.

This commit is contained in:
Juan RP 2014-09-05 15:52:57 +02:00
parent e4ab179ae9
commit 33419011e2

View file

@ -1,7 +1,7 @@
# Template file for 'qemu' # Template file for 'qemu'
pkgname=qemu pkgname=qemu
version=2.1.0 version=2.1.0
revision=6 revision=7
short_desc="Open Source Processor Emulator" short_desc="Open Source Processor Emulator"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://qemu.org" 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 libsasl-devel libglib-devel ncurses-devel libseccomp-devel>=2.1.0 nss-devel
libcurl-devel xfsprogs-devel libcap-ng-devel libcap-devel vde2-devel libcurl-devel xfsprogs-devel libcap-ng-devel libcap-devel vde2-devel
libbluetooth-devel libssh2-devel libusb-devel pulseaudio-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" depends="libusb>=1.0.15"
conf_files="/etc/qemu/target-x86_64.conf" conf_files="/etc/qemu/target-x86_64.conf"
build_options="gtk sdl1" build_options="gtk sdl sdl2"
build_options_default="sdl1" build_options_default="sdl"
desc_option_gtk="Enable GTK display and use it by default" 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() { do_configure() {
local args= local args=
@ -41,7 +42,9 @@ do_configure() {
--enable-vhost-net --enable-vnc-png --enable-vnc-tls --enable-virtfs \ --enable-vhost-net --enable-vnc-png --enable-vnc-tls --enable-virtfs \
--enable-libusb --disable-glusterfs \ --enable-libusb --disable-glusterfs \
--enable-pie --localstatedir=/var \ --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() { do_build() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then