From a698a44226a4deb046c39d68a3daa77ad983c50e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Dec 2020 15:46:22 +0100
Subject: [PATCH] qemu: update to 5.2.0.
---
srcpkgs/qemu/template | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index c6b4b1a661..e8cb4d4672 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,10 +1,10 @@
# Template file for 'qemu'
pkgname=qemu
-version=5.1.0
-revision=4
+version=5.2.0
+revision=1
build_style=configure
hostmakedepends="gettext pkg-config perl python3 automake libtool flex
- python3-Sphinx texinfo"
+ python3-Sphinx texinfo ninja"
makedepends="libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel
libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
libsasl-devel libglib-devel ncurses-devel libseccomp-devel nss-devel
@@ -15,19 +15,21 @@ makedepends="libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel
$(vopt_if spice spice-devel) $(vopt_if virgl virglrenderer-devel)
$(vopt_if opengl 'libepoxy-devel libdrm-devel MesaLib-devel')
$(vopt_if iscsi 'libiscsi-devel')
- $(vopt_if smartcard libcacard-devel) $(vopt_if numa 'libnuma-devel')"
+ $(vopt_if smartcard libcacard-devel) $(vopt_if numa 'libnuma-devel')
+ $(vopt_if spice 'pcsclite-devel')"
short_desc="Open Source Processor Emulator"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=8314b6e5fcc7bf9fa3915d504de6586a69cba30ffa27cbe9ba85d2cb9987fb3a
+checksum=7bd9334c02edaf02f5b0b52beb19fe7f72556c3ca0180e20f0095f0ef2f25f14
ignore_elf_dirs="/usr/share/qemu"
nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
- palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500"
+ palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf
+ opensbi-riscv64-generic-fw_dynamic.elf"
build_options="gtk3 opengl sdl2 spice virgl smartcard numa iscsi"
-build_options_default="opengl gtk3 virgl smartcard sdl2 numa iscsi"
+build_options_default="opengl gtk3 virgl sdl2 numa iscsi"
desc_option_sdl2="Enable SDL (2.x) video output"
desc_option_spice="Enable support for SPICE"
desc_option_virgl="Enable support for VirGL (A Virtual 3D GPU renderer)"
@@ -40,6 +42,10 @@ case "$XBPS_TARGET_MACHINE" in
aarch64-musl) CFLAGS="-D_LINUX_SYSINFO_H";;
esac
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" smartcard"
+fi
+
pre_configure() {
vsed -i 's/__u64/unsigned long/' linux-user/host/aarch64/hostdep.h
}
@@ -73,8 +79,6 @@ do_configure() {
}
do_install() {
- vsed -i Makefile -e 's;dtc/%:;dtc/libfdt:;'
-
make DESTDIR=${DESTDIR} install
# qemu-bridge-helper must be setuid for non privileged users.
chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper