From 245844784bce389a5341aa08f435d564fe4003e0 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 11 Sep 2025 01:06:22 +0200 Subject: [PATCH] - updated to 10.0.4, minor PLD merge --- qemu.spec | 49 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/qemu.spec b/qemu.spec index 858857d..88dafb4 100644 --- a/qemu.spec +++ b/qemu.spec @@ -31,6 +31,7 @@ %bcond_without systemtap # SystemTap/dtrace trace backend support %bcond_without virgl # build virgl support %bcond_without xkbcommon # xkbcommon support +%bcond_without qatzip # QATzip support %if %{without gtk3} %undefine with_vte @@ -42,18 +43,21 @@ %undefine with_ceph %undefine with_pmem %endif +%ifnarch %{ix86} %{x8664} x32 +%undefine with_qatzip +%endif %global optcppflags %{nil} Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu -Version: 10.0.3 +Version: 10.0.4 Release: 1 License: GPL v2, BSD (edk2 firmware files) Group: Applications/Emulators Source0: https://download.qemu.org/%{name}-%{version}.tar.xz -# Source0-md5: 4a244f485c9d7ac3d40f958f13eae298 +# Source0-md5: 8640ab0fde07fbf48e978e3186e840e8 # Loads kvm kernel modules at boot Source3: kvm-modules-load.conf # Creates /dev/kvm @@ -76,6 +80,7 @@ URL: https://www.qemu.org/ %{?with_opengl:BuildRequires: Mesa-libgbm-devel} %{?with_opengl:BuildRequires: OpenGL-GLX-devel} %{?with_opengl:BuildRequires: OpenGL-devel} +%{?with_qatzip:BuildRequires: QATzip-devel} %{?with_sdl:BuildRequires: SDL2-devel >= 2.0} %{?with_sdl:BuildRequires: SDL2_image-devel >= 2.0} BuildRequires: alsa-lib-devel @@ -99,11 +104,12 @@ BuildRequires: gnutls-devel >= 3.6.14 BuildRequires: jack-audio-connection-kit-devel %{?with_vfio_user:BuildRequires: json-c-devel >= 0.11} BuildRequires: keyutils-devel -BuildRequires: libaio-devel +BuildRequires: libaio-devel >= 0.3.111 BuildRequires: libblkio-devel >= 1.3.0 -BuildRequires: libbpf-devel +BuildRequires: libbpf-devel >= 1.1.0 %{?with_smartcard:BuildRequires: libcacard-devel >= 2.5.1} BuildRequires: libcap-ng-devel +BuildRequires: libcbor-devel >= 0.7.0 BuildRequires: libdrm-devel %{?with_opengl:BuildRequires: libepoxy-devel} BuildRequires: libfdt-devel >= 1.5.1 @@ -124,17 +130,17 @@ BuildRequires: libstdc++-devel >= 6:4.7 #BuildRequires: libtasn1-devel BuildRequires: libu2f-emu-devel BuildRequires: libusb-devel >= 1.0.22 -BuildRequires: liburing-devel >= 0.3 +BuildRequires: liburing-devel >= 2.2 BuildRequires: libuuid-devel BuildRequires: libxml2-devel >= 2.0 %{?with_lttng:BuildRequires: lttng-ust-devel >= 2.1} BuildRequires: lzfse-devel BuildRequires: lzo-devel >= 2 -BuildRequires: meson >= 0.63.0 +BuildRequires: meson >= 1.5.0 %{?with_multipath:BuildRequires: multipath-tools-devel} BuildRequires: ncurses-devel # also libgcrypt-devel >= 1.8 possible, but gnutls already pulls nettle -BuildRequires: nettle-devel >= 3.4 +BuildRequires: nettle-devel >= 3.9 BuildRequires: ninja >= 1.5 %{?with_smartcard:BuildRequires: nss-devel >= 1:3.12.8} BuildRequires: numactl-devel @@ -147,6 +153,8 @@ BuildRequires: pkgconfig %{?with_pmem:BuildRequires: pmdk-devel} %{?with_pulseaudio:BuildRequires: pulseaudio-devel} BuildRequires: python3 >= 1:3.7 +BuildRequires: python3-distlib +BuildRequires: python3-pycotap >= 1.1.0 BuildRequires: python3-sphinx_rtd_theme >= 0.5 BuildRequires: python3-tomli >= 1.2.0 BuildRequires: rpm-build >= 4.6 @@ -154,7 +162,7 @@ BuildRequires: rpmbuild(macros) >= 1.644 %{?with_system_seabios:BuildRequires: seabios} BuildRequires: sed >= 4.0 %{?with_snappy:BuildRequires: snappy-devel} -BuildRequires: sphinx-pdg >= 1.6 +BuildRequires: sphinx-pdg >= 3.4.3 %if %{with spice} BuildRequires: spice-protocol >= 0.14.0 BuildRequires: spice-server-devel >= 0.14.0 @@ -219,6 +227,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define systempkg_req \ Requires: capstone >= 4.0 \ Requires: daxctl-libs >= 57 \ +Requires: libaio >= 0.3.111 \ +Requires: libbpf >= 1.1.0 \ %{?with_smartcard:Requires: libcacard >= 2.5.1} \ Requires: libfdt >= 1.5.1 \ Requires: libfuse3 >= 3.8 \ @@ -228,7 +238,7 @@ Requires: libpng >= 2:1.6.34 \ Requires: libseccomp >= 2.3.0 \ %endif \ Requires: libslirp >= 4.7 \ -Requires: liburing >= 0.3 \ +Requires: liburing >= 2.2 \ Requires: libusb >= 1.0.22 \ Requires: pixman >= 0.21.8 \ %if %{with spice} \ @@ -286,8 +296,10 @@ Requires(pre): /usr/sbin/useradd Requires: glib2 >= 1:2.75.3 Requires: gnutls-libs >= 3.6.14 %{?with_gtk3:Requires: gtk+3 >= 3.22.0} +Requires: libaio >= 0.3.111 Requires: libblkio >= 1.3.0 -Requires: nettle >= 3.4 +Requires: liburing >= 2.2 +Requires: nettle >= 3.9 %{?with_vte:Requires: vte >= 0.32.0} Requires: zstd >= 1.4.0 Suggests: virtiofsd @@ -330,6 +342,8 @@ Plik nagłówkowy do tworzenia wtyczek QEMU. Summary: QEMU command line tool for manipulating disk images Summary(pl.UTF-8): Narzędzie QEMU do operacji na obrazach dysków Group: Applications/Emulators +Requires: libaio >= 0.3.111 +Requires: liburing >= 2.2 Obsoletes: qemu-kvm-img < 2 Conflicts: qemu < 1.0-2 @@ -359,6 +373,8 @@ Summary: QEMU user mode emulation of qemu targets Summary(pl.UTF-8): QEMU - emulacja trybu użytkownika środowisk qemu Group: Applications/Emulators Requires: %{name}-common = %{version}-%{release} +Requires: libaio >= 0.3.111 +Requires: liburing >= 2.2 Obsoletes: qemu-kvm-user < 2 %description user @@ -735,6 +751,7 @@ Summary: QEMU system emulator for x86 Summary(pl.UTF-8): QEMU - emulator systemu z procesorem x86 Group: Applications/Emulators Requires: %{name}-common = %{version}-%{release} +Requires: libcbor >= 0.7.0 %{?with_vfio_user:Requires: libvfio-user = %{version}-%{release}} %{?with_system_seabios:Requires: seabios >= 1.11.0} %systempkg_req @@ -778,7 +795,7 @@ Summary: QEMU guest agent Summary(pl.UTF-8): Agent gościa QEMU Group: Daemons Requires: glib2 >= 1:2.75.3 -Requires: liburing >= 0.3 +Requires: liburing >= 2.2 Obsoletes: qemu-kvm-guest-agent < 2 Conflicts: SysVinit < 2.96-2 @@ -1064,6 +1081,7 @@ build dynamic \ %{__enable_disable glusterfs} \ %{!?with_gtk3:--disable-gtk} \ %{__enable_disable iscsi libiscsi} \ + --enable-libcbor \ %{__enable_disable libnfs} \ %{__enable_disable pipewire} \ %{__enable_disable pmem libpmem} \ @@ -1074,6 +1092,7 @@ build dynamic \ --enable-nettle \ --enable-plugins \ %{__enable_disable ceph rbd} \ + %{__enable_disable qatzip} \ %{__enable_disable rdma} \ %{__enable_disable sdl} \ %{__enable_disable seccomp} \ @@ -1106,11 +1125,13 @@ build static \ --disable-gtk \ --disable-guest-agent \ --disable-guest-agent-msi \ + --disable-libcbor \ --disable-libnfs \ --disable-linux-io-uring \ --disable-mpath \ --disable-nettle \ --disable-pie \ + --disable-qatzip \ --disable-sdl \ --disable-slirp \ --disable-spice \ @@ -1271,8 +1292,10 @@ fi %endif %attr(755,root,root) %{_bindir}/qemu-nbd %attr(755,root,root) %{_bindir}/qemu-pr-helper -%attr(755,root,root) %{_bindir}/qemu-vmsr-helper %attr(755,root,root) %{_bindir}/qemu-storage-daemon +%ifarch %{ix86} %{x8664} x32 +%attr(755,root,root) %{_bindir}/qemu-vmsr-helper +%endif %attr(755,root,root) %{_sbindir}/ksmctl %attr(755,root,root) %{_sbindir}/ksmtuned %attr(755,root,root) %{_libexecdir}/qemu-bridge-helper @@ -1300,7 +1323,7 @@ fi %attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-pci.so %{?with_virgl:%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-pci-gl.so} %attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga.so -%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga-gl.so +%{?with_virgl:%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga-gl.so} %attr(755,root,root) %{_libdir}/%{name}/hw-s390x-virtio-gpu-ccw.so %attr(755,root,root) %{_libdir}/%{name}/hw-uefi-vars.so %attr(755,root,root) %{_libdir}/%{name}/hw-usb-host.so -- 2.51.0