extra/qemu to 5.0.0-5

extra/qemu/PKGBUILD

@@ -12,20 +12,20 @@ pkgbase=qemu
 pkgname=(qemu qemu-headless qemu-arch-extra qemu-headless-arch-extra
          qemu-block-{iscsi,gluster} qemu-guest-agent)
 pkgdesc="A generic and open source machine emulator and virtualizer"
-pkgver=4.2.0
-pkgrel=2
+pkgver=5.0.0
+pkgrel=5
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
 url="https://wiki.qemu.org/"
-_headlessdeps=(gnutls libpng libaio jemalloc xfsprogs libnfs
+_headlessdeps=(gnutls libpng libaio numactl libnfs
                lzo snappy curl vde2 libcap-ng spice libcacard usbredir libslirp
-               libssh)
+               libssh zstd liburing)
 depends=(virglrenderer sdl2 vte3 libpulse brltty "${_headlessdeps[@]}")
-makedepends=(spice-protocol python libiscsi glusterfs python-sphinx)
+makedepends=(spice-protocol python libiscsi glusterfs python-sphinx xfsprogs)
 source=(https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig}
         qemu-ga.service
         65-kvm.rules)
-sha512sums=('2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56'
+sha512sums=('21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf'
             'SKIP'
             '269c0f0bacbd06a3d817fde02dce26c99d9f55c9e3b74bb710bd7e5cdde7a66b904d2eb794c8a605bf9305e4e3dee261a6e7d4ec9d9134144754914039f176e4'
             'bdf05f99407491e27a03aaf845b7cc8acfa2e0e59968236f10ffc905e5e3d5e8569df496fd71c887da2b5b8d1902494520c7da2d3a8258f7fd93a881dd610c99')
@@ -51,7 +51,6 @@ build() {
 
   _build headless \
     --audio-drv-list= \
-    --disable-bluez \
     --disable-sdl \
     --disable-gtk \
     --disable-vte \
@@ -63,22 +62,17 @@ build() {
 _build() (
   cd build-$1
 
-  # qemu vs. make 4 == bad
-  export ARFLAGS=rv
-
-  # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
-  export CFLAGS+=" -fPIC"
-
   ../${pkgname}-${pkgver}/configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --libexecdir=/usr/lib/qemu \
+    --extra-ldflags="$LDFLAGS" \
     --smbd=/usr/bin/smbd \
     --enable-modules \
     --enable-sdl \
-    --enable-jemalloc \
     --enable-slirp=system \
+    --enable-xfsctl \
     "${@:2}"
 
   make
@@ -106,7 +100,7 @@ _package() {
                'qemu-block-iscsi: iSCSI block support'
                'qemu-block-gluster: glusterfs block support')
   install=qemu.install
-  options=(!strip)
+  options=(!strip !emptydirs)
 
   make -C build-$1 DESTDIR="$pkgdir" install "${@:2}"
 
@@ -118,7 +112,6 @@ _package() {
   rm -r var
 
   cd usr/lib
-  tidy_strip
 
   # bridge_helper needs suid
   # https://bugs.archlinux.org/task/32565
@@ -128,7 +121,6 @@ _package() {
   rm qemu/block-{iscsi,gluster}.so
 
   cd ../bin
-  tidy_strip
 
   # remove extra arch
   for _bin in qemu-*; do
@@ -139,7 +131,7 @@ _package() {
       ga) rm "$_bin"; continue ;;
 
       # tools
-      img|io|nbd) continue ;;
+      edid|img|io|keymap|nbd|pr-helper|storage-daemon) continue ;;
 
       # core emu
       system-${_corearch}) continue ;;
@@ -153,21 +145,27 @@ _package() {
     [[ -f $_blob ]] || continue
 
     case $_blob in
+      # provided by edk2-ovmf package
+      edk2-*) rm "$_blob"; continue ;;
+
       # iPXE ROMs
       efi-*|pxe-*) continue ;;
 
       # core blobs
-      kvmvapic.bin|linuxboot*|multiboot.bin|sgabios.bin|vgabios*) continue ;;
+      bios-microvm.bin|kvmvapic.bin|linuxboot*|multiboot.bin|sgabios.bin|vgabios*) continue ;;
 
       # Trace events definitions
       trace-events*) continue ;;
-
-      # Logos
-      *.bmp|*.svg) continue ;;
     esac
 
     mv "$_blob" "$srcdir/extra-arch-$1/usr/share/qemu"
   done
+
+  # provided by edk2-ovmf package
+  rm -r firmware
+
+  cd ..
+  if [ "$1" = headless ]; then rm -r {applications,icons}; fi
 }
 
 package_qemu-arch-extra() {
@@ -190,7 +188,7 @@ package_qemu-headless-arch-extra() {
 
 package_qemu-block-iscsi() {
   pkgdesc="QEMU iSCSI block module"
-  depends=(glib2 libiscsi jemalloc)
+  depends=(glib2 libiscsi)
 
   install -D build-full/block-iscsi.so "$pkgdir/usr/lib/qemu/block-iscsi.so"
 }