utils/qemu: version 7.0.0

5 files changed, 30 insertions, 19 deletions

diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 86ad8417cf..49dc0ab6ec 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -15,11 +15,13 @@ case "$HOST" in
     ;;
 esac &&
 
+OPTS+=" --meson=$(get_spell_provider ${SPELL} MESON-BUILD)" &&
+
 ./configure --prefix="$INSTALL_ROOT/usr"    \
             --sysconfdir="$INSTALL_ROOT/etc" \
             --localstatedir="$INSTALL_ROOT/var" \
-            --target-list="$QEMU_ARCHS"     \
-            --audio-drv-list="$QEMU_AUDIO"  \
+            --target-list="${QEMU_ARCHS// /,}"  \
+            --audio-drv-list="${QEMU_AUDIO// /,}" \
             $QEMU_OPTS                      \
             $OPTS                           &&
 
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index c076da7b33..b6911ec9ff 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -35,7 +35,7 @@ fi
 . $GRIMOIRE/config_query_multi.function                              &&
 
 config_query_multi QEMU_AUDIO "Select sound system(s) to support"    \
-     oss alsa sdl esd pa fmod                                        &&
+     oss alsa sdl jack pa                                            &&
 
 persistent_remove  QEMU_CARDS                                        &&
 
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 3a3b7b6791..d4644ddf6e 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -1,8 +1,5 @@
 . "$GRIMOIRE"/MESON_DEPENDS &&
 . "$GRIMOIRE"/VDEPENDS &&
-vdepends <<! &&
-	python3               flags: --python=python3
-!
 
 case "$HOST" in
   (*-musl)
@@ -27,8 +24,12 @@ if list_find "pa" $QEMU_AUDIO; then
   depends  pulseaudio
 fi &&
 
-if list_find "esd" $QEMU_AUDIO; then
-  depends  esound
+if list_find "jack" ${QEMU_AUDIO}; then
+  depends JACK
+fi &&
+
+if list_find "oss" ${QEMU_AUDIO}; then
+  depends oss
 fi &&
 
 if list_find '--enable-docs' ${QEMU_OPTS}; then
@@ -115,17 +116,17 @@ optional_depends bzip2 \
 		 --{enable,disable}-bzip2 \
 		 'for reading bzip2-compressed DMG images' &&
 
-optional_depends lzfse \
-		 --{enable,disable}-lzfse \
-		 'for reading lzfse-compressed DMG images' &&
+#optional_depends lzfse \
+#		 --{enable,disable}-lzfse \
+#		 'for reading lzfse-compressed DMG images' &&
 
 optional_depends zstd \
 		 --{enable,disable}-zstd \
 		 'for migration and qcow2 cluster compression' &&
 
 optional_depends libxml2 \
-		 '--enable-libxml2 --enable-parallels' \
-		 '--disable-libxml2' \
+		 '--enable-parallels' \
+		 '--disable-parallels' \
 		 'for Parallels image format support' &&
 
 case "$QEMU_OPTS" in *--enable-vnc*)
@@ -165,8 +166,7 @@ optional_depends capstone \
 		 --{enable,disable}-capstone \
 		 'for capstone disassembler support' &&
 
-optional_depends jemalloc \
-		 --{enable,disable}-jemalloc \
+optional_depends jemalloc '--enable-malloc=jemalloc' '' \
 		 'for jemalloc support' &&
 
 optional_depends libssh \
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 4b151ecb4e..5b635a5191 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,6 +1,6 @@
            SPELL=qemu
-         VERSION=6.1.0
-          SOURCE=$SPELL-$VERSION.tar.bz2
+         VERSION=7.0.0
+          SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
    SOURCE_URL[0]=http://wiki.qemu.org/download/$SOURCE
@@ -14,7 +14,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
         KEYWORDS="emulator utils"
          ENTERED=20051102
   SECURITY_PATCH=2
-           TMPFS=OFF
+           #TMPFS=OFF
            SHORT="generic and open source processor emulator"
 cat << EOF
 QEMU achieves a good emulation speed by using dynamic translation.
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index c89a6dfbcd..c652ac0bc9 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,12 @@
+2022-08-08 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 7.0.0, bz2 -> xz
+	* BUILD: added possible muon build option, made target archs and audio
+	  backends comma separated lists
+	* CONFIGURE: removed esound and fmod audio backend options, added JACK
+	* DEPENDS: removed python3 (MESON_DEPENDS should be enough), added JACK and
+	  oss, commented out lzfse (no such spell yet), corrected libxml2 and
+	  jemalloc flags
+
 2022-04-23 Ismael Luceno <ismael@sourcemage.org>
 	* DEPENDS: switched to MESON_DEPENDS
 
@@ -20,7 +29,7 @@
 	* DEPENDS: on musl hosts request musl 1.2.2+ (sigevent API)
 	  added meson and ninja-build-system
 	  added optional deps on: DEVICE-MANAGER, capstone, fuse3, jemalloc,
-            libssh2, libxml2, lzfse, sdl2_image, and zstd
+		libssh2, libxml2, lzfse, sdl2_image, and zstd
 	  fixed flags for snappy
 	* CONFIGURE, DEPENDS: reworked TLS library dependencies
 	* BUILD: added removal of -ffast-math from CFLAGS