diff --git a/srcpkgs/qemu/patches/time64.patch b/srcpkgs/qemu/patches/time64.patch deleted file mode 100644 index 28be9300489..00000000000 --- a/srcpkgs/qemu/patches/time64.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/contrib/vhost-user-input/main.c 2020-12-08 17:59:44.000000000 +0100 -+++ b/contrib/vhost-user-input/main.c 2020-12-12 20:59:04.316996648 +0100 -@@ -114,14 +114,17 @@ - - static void vi_handle_status(VuInput *vi, virtio_input_event *event) - { -+ struct timeval tv; - struct input_event evdev; - int rc; - -- if (gettimeofday(&evdev.time, NULL)) { -+ if (gettimeofday(&tv, NULL)) { - perror("vi_handle_status: gettimeofday"); - return; - } - -+ evdev.input_event_sec = tv.tv_sec; -+ evdev.input_event_usec = tv.tv_usec; - evdev.type = le16toh(event->type); - evdev.code = le16toh(event->code); - evdev.value = le32toh(event->value); ---- a/hw/input/virtio-input-host.c 2020-12-08 17:59:44.000000000 +0100 -+++ b/hw/input/virtio-input-host.c 2020-12-12 21:33:44.750471890 +0100 -@@ -192,14 +192,17 @@ - virtio_input_event *event) - { - VirtIOInputHost *vih = VIRTIO_INPUT_HOST(vinput); -+ struct timeval tv; - struct input_event evdev; - int rc; - -- if (gettimeofday(&evdev.time, NULL)) { -+ if (gettimeofday(&tv, NULL)) { - perror("virtio_input_host_handle_status: gettimeofday"); - return; - } - -+ evdev.input_event_sec = tv.tv_sec; -+ evdev.input_event_usec = tv.tv_usec; - evdev.type = le16_to_cpu(event->type); - evdev.code = le16_to_cpu(event->code); - evdev.value = le32_to_cpu(event->value); diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 5205c4e2f5e..fed2997e8dc 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,11 +1,11 @@ # Template file for 'qemu' # This package should be updated together with qemu-user-static pkgname=qemu -version=6.0.0 -revision=3 +version=6.1.0 +revision=1 build_style=configure hostmakedepends="gettext pkg-config perl python3 automake libtool flex - python3-Sphinx texinfo ninja" + python3-Sphinx python3-sphinx_rtd_theme 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 @@ -24,7 +24,7 @@ maintainer="Helmut Pozimski " 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=7d306a03c67c0b667d21b55e1b172f5e55a9af5ee09cbd739fb2395aeca7860c +checksum=6bc93a46361450b2c701c4f4e7cc81adc50e3ae0f2005b8f0fbf14fc23372a24 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 opensbi-riscv32-generic-fw_dynamic.elf