[packages/qemu] - updated to 8.2.4; one more x32 hack

[qboosh]

commit eebbd4dc949ad29f1677ef2d1de3128fce3f86e2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 28 21:49:03 2024 +0200

    - updated to 8.2.4; one more x32 hack

 qemu-cflags.patch | 28 +++++++++++-----------------
 qemu.spec         | 14 ++++++++++----
 2 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/qemu.spec b/qemu.spec
index ea2b103..53a0391 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -44,12 +44,12 @@
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
-Version:	8.1.5
+Version:	8.2.4
 Release:	1
 License:	GPL v2, BSD (edk2 firmware files)
 Group:		Applications/Emulators
 Source0:	https://download.qemu.org/%{name}-%{version}.tar.xz
-# Source0-md5:	2434331a1e32cb919f02897865a2e927
+# Source0-md5:	aa5c2f004d513b746f25a00cfec8eaa5
 # Loads kvm kernel modules at boot
 Source3:	kvm-modules-load.conf
 # Creates /dev/kvm
@@ -129,6 +129,7 @@ BuildRequires:	libu2f-emu-devel
 BuildRequires:	libusb-devel >= 1.0.22
 BuildRequires:	liburing-devel >= 0.3
 BuildRequires:	libuuid-devel
+BuildRequires:	libxdp-devel >= 1.4.0
 BuildRequires:	libxml2-devel >= 2.0
 %{?with_lttng:BuildRequires:	lttng-ust-devel >= 2.1}
 BuildRequires:	lzfse-devel
@@ -150,13 +151,14 @@ BuildRequires:	pkgconfig
 %{?with_pmem:BuildRequires:	pmdk-devel}
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	python3 >= 1:3.7
-BuildRequires:	python3-sphinx_rtd_theme
+BuildRequires:	python3-sphinx_rtd_theme >= 0.5
+BuildRequires:	python3-tomli >= 1.2.0
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.644
 %{?with_system_seabios:BuildRequires:	seabios}
 BuildRequires:	sed >= 4.0
 %{?with_snappy:BuildRequires:	snappy-devel}
-BuildRequires:	sphinx-pdg
+BuildRequires:	sphinx-pdg >= 1.6
 %if %{with spice}
 BuildRequires:	spice-protocol >= 0.14.0
 BuildRequires:	spice-server-devel >= 0.14.0
@@ -232,6 +234,7 @@ Requires:	libseccomp >= 2.3.0 \
 Requires:	libslirp >= 4.7 \
 Requires:	liburing >= 0.3 \
 Requires:	libusb >= 1.0.22 \
+Requires:	libxdp >= 1.4.0 \
 Requires:	pixman >= 0.21.8 \
 %if %{with spice} \
 Requires:	spice-server-libs >= 0.14.0 \
@@ -1050,6 +1053,9 @@ Pliki nagłówkowe biblioteki vfio-user.
 %ifarch x32
 # xen-emu supports only LP64 __x86_64__ case
 %{__sed} -i -e '/^config XEN_EMU/,$ s/default y/default n/' hw/i386/Kconfig
+
+# plain x32 doesn't provide __sync_bool_compare_and_swap_16 - fail int128_t/ATOMIC128 tests earlier
+%{__sed} -i -e '/^has_int128_type = / s/$/FAILME/' meson.build
 %endif
 
 %build
diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index bdc34a6..a2d165f 100644
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,19 +1,13 @@
---- qemu-8.1.5/meson.build.orig	2024-01-29 19:31:43.000000000 +0100
-+++ qemu-8.1.5/meson.build	2024-05-06 18:19:10.780261171 +0200
-@@ -478,16 +478,6 @@ if 'cpp' in all_languages
-   qemu_cxxflags = ['-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS'] + qemu_cflags
- endif
+--- qemu-8.2.4/include/qemu/osdep.h.orig	2024-05-13 21:19:44.000000000 +0200
++++ qemu-8.2.4/include/qemu/osdep.h	2024-05-28 21:35:11.927464569 +0200
+@@ -27,10 +27,6 @@
+ #ifndef QEMU_OSDEP_H
+ #define QEMU_OSDEP_H
  
--# clang does not support glibc + FORTIFY_SOURCE (is it still true?)
--if get_option('optimization') != '0' and targetos == 'linux'
--  if cc.get_id() == 'gcc'
--    qemu_cflags += ['-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=2']
--  endif
--  if 'cpp' in all_languages and cxx.get_id() == 'gcc'
--    qemu_cxxflags += ['-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=2']
--  endif
--endif
+-#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ && defined __linux__
+-# define _FORTIFY_SOURCE 2
+-#endif
 -
- add_project_arguments(qemu_cflags, native: false, language: 'c')
- add_project_arguments(cc.get_supported_arguments(warn_flags), native: false, language: 'c')
- if 'cpp' in all_languages
+ #include "config-host.h"
+ #ifdef NEED_CPU_H
+ #include CONFIG_TARGET
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qemu.git/commitdiff/eebbd4dc949ad29f1677ef2d1de3128fce3f86e2