aboutsummaryrefslogtreecommitdiff
path: root/system/qemu
diff options
context:
space:
mode:
Diffstat (limited to 'system/qemu')
-rw-r--r--system/qemu/README19
-rw-r--r--system/qemu/qemu.SlackBuild7
-rw-r--r--system/qemu/qemu.info2
3 files changed, 12 insertions, 16 deletions
diff --git a/system/qemu/README b/system/qemu/README
index 1c9b196e0cbc3..987806c423e63 100644
--- a/system/qemu/README
+++ b/system/qemu/README
@@ -41,23 +41,16 @@ your processor) prior to launching qemu-system-ARCH with kvm enabled.
For older/unmaintained qemu frontends, this build also creates a symlink
to qemu-system-ARCH at /usr/bin/qemu-kvm.
-libslirp (user mode networking), libcacard, spice, usbredir,
-virglrenderer, libnfs, snappy, device-tree-compiler, glusterfs, and vde2
-are optional dependencies.
+libiscsi (to access iSCSI targets directly), libslirp (user mode
+networking), libcacard, spice, usbredir, virglrenderer, libnfs, snappy,
+glusterfs, and vde2, sphinx-rtd-theme and Sphinx (to build documentation)
+are optional dependencies that will be automatically detected during
+compilation, if present (all avialable on SBo).
-To enable user mode networking, install libslirp (availale on SBO), then
-compile qemu:
+To enable user mode networking, install libslirp, then compile qemu:
SLIRP=yes ./qemu.SlackBuild
-libiscsi (to access iSCSI targets directly) is optional dependency,
-and will be picked up, if present, during the compilation.
-
-sphinx-rtd-theme and Sphinx (both on SBo) are optional but required in
-order for any of the documentation to be built.
-
-If you wish to emulate ARM, you will want device-tree-compiler.
-
NOTES:
This version breaks some backward compatibility with earlier versions.
Consult the official changelogs for details.
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 73604dc9e3a9d..1f6ebfffbbb88 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=qemu
VERSION=${VERSION:-8.2.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -93,6 +93,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} + || true
+# Use newer meson from python3-meson-opt
+PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+export PYTHONPATH=/opt/python$PYVER/site-packages
+
# Remove double CFLAGS
sed -i "s|^\ \ CFLAGS=\"-O2\ | CFLAGS=\"|" configure
@@ -133,7 +137,6 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-virtfs \
--enable-sdl \
--enable-malloc=jemalloc \
- --enable-fdt=auto \
--enable-nettle \
--${uring}able-linux-io-uring \
--audio-drv-list=${AUDIODRIVERS} \
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index 7e9f20f0286f3..48d9efdf8c2b7 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.qemu.org/qemu-8.2.2.tar.xz"
MD5SUM="e43091262671c1728b09522932b75b1d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="device-tree-compiler python3-meson-opt"
MAINTAINER="Edward W. Koenig"
EMAIL="kingbeowulf@linuxgalaxy.org"