commit: ae494864d28b0d027b67b39d665dfb51c60f3df5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 6 09:36:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 6 09:37:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae494864
app-emulation/qemu: add 9.1.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-emulation/qemu/Manifest | 2 ++
.../files/qemu-9.1.0-capstone-include-path.patch | 33 ++++++++++++++++++++++
.../qemu/{qemu-9999.ebuild => qemu-9.1.0.ebuild} | 4 +--
app-emulation/qemu/qemu-9999.ebuild | 4 +--
4 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 062718123b31..9f7bf8f38f65 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -19,3 +19,5 @@ DIST qemu-9.0.0-docs.tar.xz 2290196 BLAKE2B
82d22637ff2629bee372550e86651f12051e
DIST qemu-9.0.1.tar.xz 132368412 BLAKE2B
e96ae5cc3ee935dd31232d38d46bbdc74fd3a2a0dd8517c0e035757f3ded92712dfa68d0068cd8c37f314a92d237e2b4a725b509ba402b7a1ce92df63207a08d
SHA512
6c120aaf52f15e79c32d883cc83df8fc83222d538ea6be9c19aaddfba0aef91479b5826bbc03e58688fba639cb24bc6f54e525ccc2404ed5d820766d11735210
DIST qemu-9.0.2.tar.xz 132387528 BLAKE2B
6b5301f985919ae53e056410be7486b8150a65016127568bd4d58f596e94960d08eb3fc57cff7ff6a3435d71274adee516f57375d856d61b4fc7a3f24cbf75c4
SHA512
58ed84f6fe6263d279356bc9193f96edf62cf3663fb151daa3f047d52329fe49cb91c2d45e09697e0469f4f5409be96403aec9572d4871ffa40848a786c21599
DIST qemu-9.0.3.tar.xz 132420136 BLAKE2B
af44ee6d3e59c28bb84cbf78a4793fa120a7cb811ab0fb0aba7b61d0b2eeb0e47dd094a4a0af9570e26d584f7ae867d46b6f61903610e155deb6479d8ea60fa4
SHA512
fcd72896ae9f9f654628540e09472c8388d980f8081990ee541f3540f92c5fd0d9332fa343dc9eaa6d7fe3dc2a5668d7d5c3784ba9d49bd7df9d37a4f9df7572
+DIST qemu-9.1.0-docs.tar.xz 2376072 BLAKE2B
31d13133b3a2e21a7d9b5af028407610ae8f2fa61dd296fc35e57fc12eb66cfd1a39ec5e3b5a3852095d10a388f424f8a38417b3ab58ca30d0817ece779328cf
SHA512
5b705b577daad6aa010d5c713db9dc314114334b89901840ebcecc9032595a969f5ad9054e42b36b2be5ef9f5d6dc1159841ff46dbb08314b5c48491aa631040
+DIST qemu-9.1.0.tar.xz 132478356 BLAKE2B
77bdaf00e6111e6ac94462a6023aac0d3df9d2829a961fd89a5bdafc4aee7f95c2695d9319715e630960e64512a41b3ff987c9096692ff304cfd49357b46ef62
SHA512
bf61d65e37945fa8ee8640712c719ace05164d86e6df700b98bdc5f79e0a8d5e8f85bd48e726edb62b2419db20673f63ec8b63a60393a914b09cb365621b35e2
diff --git a/app-emulation/qemu/files/qemu-9.1.0-capstone-include-path.patch
b/app-emulation/qemu/files/qemu-9.1.0-capstone-include-path.patch
new file mode 100644
index 000000000000..7bb6a004d866
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-9.1.0-capstone-include-path.patch
@@ -0,0 +1,33 @@
+From: Sam James <[email protected]>
+Date: Sun, 6 Oct 2024 09:47:03 +0100
+Subject: [PATCH] Forward ported from qemu-7.1.0-capstone-include-path.patch.
+
+Bug: https://bugs.gentoo.org/873157
+Signed-off-by: Sam James <[email protected]>
+---
+ include/disas/capstone.h | 2 +-
+ meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/disas/capstone.h
++++ b/include/disas/capstone.h
+@@ -4,7 +4,7 @@
+ #ifdef CONFIG_CAPSTONE
+
+ #define CAPSTONE_AARCH64_COMPAT_HEADER
+-#include <capstone.h>
++#include <capstone/capstone.h>
+
+ #else
+
+--- a/meson.build
++++ b/meson.build
+@@ -1769,7 +1769,7 @@ if not get_option('capstone').auto() or have_system or
have_user
+ # that reports a wrong -I path, causing the #include to
+ # fail later. If the system has such a broken version
+ # do not use it.
+- if capstone.found() and not cc.compiles('#include <capstone.h>',
++ if capstone.found() and not cc.compiles('#include <capstone/capstone.h>',
+ dependencies: [capstone])
+ capstone = not_found
+ if get_option('capstone').enabled()
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-9.1.0.ebuild
similarity index 99%
copy from app-emulation/qemu/qemu-9999.ebuild
copy to app-emulation/qemu/qemu-9.1.0.ebuild
index c959ff18faaf..549817d8345e 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Generate using
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
# Set to 1 if prebuilt, 0 if not
# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0}
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
QEMU_DOCS_PREBUILT_DEV=sam
QEMU_DOCS_VERSION=$(ver_cut 1-3)
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
@@ -318,7 +318,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch
- "${FILESDIR}"/${PN}-9.0.0-capstone-include-path.patch
+ "${FILESDIR}"/${PN}-9.1.0-capstone-include-path.patch
"${FILESDIR}"/${PN}-9.0.0-also-build-virtfs-proxy-helper.patch
"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-9999.ebuild
index c959ff18faaf..549817d8345e 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Generate using
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
# Set to 1 if prebuilt, 0 if not
# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0}
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
QEMU_DOCS_PREBUILT_DEV=sam
QEMU_DOCS_VERSION=$(ver_cut 1-3)
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
@@ -318,7 +318,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch
- "${FILESDIR}"/${PN}-9.0.0-capstone-include-path.patch
+ "${FILESDIR}"/${PN}-9.1.0-capstone-include-path.patch
"${FILESDIR}"/${PN}-9.0.0-also-build-virtfs-proxy-helper.patch
"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
