version up: qemu 5.2.0

component/ncurses/buildout.cfg

@@ -14,6 +14,8 @@ patches =
   ${:_profile_base_location_}/ncurses-5.9-gcc-5.patch#57f4cd0cc0c0a42a5ddb2167f9546d72
 configure-options =
   --prefix=@@LOCATION@@
+  --enable-pc-files
+  --with-pkg-config-libdir=@@LOCATION@@/lib/pkgconfig
   --with-shared
   --without-ada
   --without-manpages
@@ -23,8 +25,9 @@ configure-options =
   --without-gpm
   --enable-rpath
 # tricky way to rerun with --enable-widec
+# we even clean before rerun otherwise some steps like the installation of pc files are skipped
 make-targets =
-  install && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
+  install clean && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
 post-install =
   cd '%(location)s/include'
   mv ncursesw/* .

component/qemu-kvm/buildout.cfg

@@ -8,25 +8,38 @@ extends =
   ../libcap-ng/buildout.cfg
   ../libpng/buildout.cfg
   ../libuuid/buildout.cfg
+  ../meson/buildout.cfg
   ../ncurses/buildout.cfg
+  ../ninja/buildout.cfg
+  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
   ../zlib/buildout.cfg
-  ../pcre/buildout.cfg
   ../glib/buildout.cfg
 
 [qemu]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://download.qemu.org/qemu-4.2.1.tar.xz
-md5sum = dac9c31eb3ef1d0cfe30251f238c49c4
+url = https://download.qemu.org/qemu-5.2.0.tar.xz
+md5sum = 179f86928835da857c237b42f4b2df73
+patches =
+# backport (2021-03-20)
+  https://gitlab.com/qemu-project/qemu/-/commit/3eacf70bb5a83e4775ad8003cbca63a40f70c8c2.patch#c4330b02f331a827145009d85e4f6862
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+pre-configure =
+  sed -i '/^libmigration\b/s/$/ dependencies: [zlib],/' meson.build
+  sed -i 's/\bsnappy,/zlib, \0/' dump/meson.build
 configure-options =
+  --meson=${meson:location}/bin/meson
+  --ninja=${ninja:location}/bin/ninja
   --target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu"
   --enable-system
   --disable-sdl
   --disable-xen
   --disable-vnc-sasl
   --disable-curl
+  --enable-gnutls
   --enable-kvm
   --enable-linux-aio
   --enable-virtfs
@@ -35,14 +48,16 @@ configure-options =
   --enable-vnc
   --enable-vnc-png
   --disable-vnc-jpeg
-  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${ncurses:location}/include -I${zlib:location}/include -I${libpng:location}/include -I${libaio:location}/include -I${attr:location}/include -I${libcap:location}/include -I${libcap-ng:location}/include "
-  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libgpg-error:location}/lib -L${libgpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib -L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib"
   --disable-werror
-  --disable-xfsctl
 environment =
+  CFLAGS=-I${gettext:location}/include -I${libaio:location}/include -I${libcap-ng:location}/include
+  LDFLAGS=-L${gettext:location}/lib -L${libaio:location}/lib -L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${gnutls:location}/lib -Wl,-rpath=${nettle:location}/lib -Wl,-rpath=${pixman:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libaio:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
-  LDFLAGS=-L${pixman:location}/lib -Wl,-rpath=${pixman:location}/lib
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${gnutls:pkg-config-path}:${libpng:location}/lib/pkgconfig:${ncurses:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
+
+[qemu:sys.version_info < (3,6)]
+environment +=
+  PYTHON=${python3:executable}
 
 [debian-netinst-base]
 recipe = slapos.recipe.build:download