emulators/qemu-devel: Update version 5.1.0.20201019=>6.1.0.20210928

- Move upstream site to GITLAB

Relnotes: https://gitlab.com/qemu-project/qemu/-/commits/master/

5 files changed, 13 insertions, 137 deletions

diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure
index e637e548f6c1..0137de386d62 100644
--- a/emulators/qemu-devel/files/patch-configure
+++ b/emulators/qemu-devel/files/patch-configure
@@ -1,39 +1,15 @@
---- configure.orig	2020-10-19 09:52:57 UTC
+--- configure.orig	2021-09-27 14:03:42 UTC
 +++ configure
-@@ -1534,7 +1534,7 @@ if test "$mingw32" = "yes" ; then
-     sysconfdir="$prefix"
-     local_statedir=
+@@ -1635,7 +1635,7 @@ if test "$mingw32" = "yes" ; then
  else
--    mandir="${mandir:-$prefix/share/man}"
-+    mandir="${mandir:-$prefix/man}"
-     datadir="${datadir:-$prefix/share}"
-     docdir="${docdir:-$prefix/share/doc}"
      bindir="${bindir:-$prefix/bin}"
-@@ -3112,6 +3112,14 @@ if check_include "sys/signal.h" ; then
  fi
- 
- ##########################################
-+# getifaddrs (for tests/test-io-channel-socket )
-+
-+have_ifaddrs_h=yes
-+if ! check_include "ifaddrs.h" ; then
-+  have_ifaddrs_h=no
-+fi
-+
-+##########################################
- # VTE probe
- 
- if test "$vte" != "no"; then
-@@ -4522,7 +4530,7 @@ fi
- 
- # check for libusb
- if test "$libusb" != "no" ; then
--    if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
-+    if $pkg_config libusb-1.0; then
-         libusb="yes"
-         libusb_cflags=$($pkg_config --cflags libusb-1.0)
-         libusb_libs=$($pkg_config --libs libusb-1.0)
-@@ -6226,6 +6234,9 @@ fi
+-mandir="${mandir:-$prefix/share/man}"
++mandir="${mandir:-$prefix/man}"
+ datadir="${datadir:-$prefix/share}"
+ docdir="${docdir:-$prefix/share/doc}"
+ sysconfdir="${sysconfdir:-$prefix/etc}"
+@@ -4607,6 +4607,9 @@ echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $confi
  # if this macro is set.
  if test "$have_fsxattr" = "yes" ; then
      echo "HAVE_FSXATTR=y" >> $config_host_mak
@@ -41,5 +17,5 @@
 +if test "$have_ifaddrs_h" = "yes" ; then
 +    echo "HAVE_IFADDRS_H=y" >> $config_host_mak
  fi
- if test "$have_copy_file_range" = "yes" ; then
-     echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak
+ if test "$xen" = "enabled" ; then
+   echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
diff --git a/emulators/qemu-devel/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc b/emulators/qemu-devel/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc
deleted file mode 100644
index 546595845c62..000000000000
--- a/emulators/qemu-devel/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- disas/libvixl/vixl/a64/disasm-a64.cc.orig	2019-04-23 18:14:45 UTC
-+++ disas/libvixl/vixl/a64/disasm-a64.cc
-@@ -2693,7 +2693,7 @@ void Disassembler::AppendPCRelativeOffsetToOutput(cons
-   if (offset < 0) {
-     abs_offset = -abs_offset;
-   }
--  AppendToOutput("#%c0x%" PRIx64, sign, abs_offset);
-+  AppendToOutput("#%c0x%" PRIx64, sign, offset < 0 ? -offset : offset);
- }
- 
- 
diff --git a/emulators/qemu-devel/files/patch-docs_meson.build b/emulators/qemu-devel/files/patch-docs_meson.build
deleted file mode 100644
index 981e0eab746f..000000000000
--- a/emulators/qemu-devel/files/patch-docs_meson.build
+++ /dev/null
@@ -1,79 +0,0 @@
---- docs/meson.build.orig	2020-10-19 13:41:20 UTC
-+++ docs/meson.build
-@@ -1,9 +1,9 @@
- if get_option('sphinx_build') == ''
-   sphinx_build = find_program(['sphinx-build-3', 'sphinx-build'],
--                              required: get_option('docs'))
-+                              required: true)
- else
-   sphinx_build = find_program(get_option('sphinx_build'),
--                              required: get_option('docs'))
-+                              required: true)
- endif
- 
- # Check if tools are available to build documentation.
-@@ -26,12 +26,6 @@ if sphinx_build.found()
-     tmpdir / 'sphinx/out'])
-   build_docs = (sphinx_build_test_out.returncode() == 0)
- 
--  if not build_docs
--    warning('@0@ exists but it is either too old or uses too old a Python version'.format(get_option('sphinx_build')))
--    if get_option('docs').enabled()
--      error('Install a Python 3 version of python-sphinx')
--    endif
--  endif
- endif
- 
- if build_docs
-@@ -111,5 +105,51 @@ if build_docs
-   endforeach
-   alias_target('sphinxdocs', sphinxdocs)
-   alias_target('html', sphinxdocs)
-+  alias_target('man', sphinxmans)
-+else
-+  manuals = [ 'interop', 'tools', 'system' ]
-+  man_pages = {
-+    'interop' : {
-+        'qemu-ga.8': (have_tools ? 'man8' : ''),
-+        'qemu-ga-ref.7': 'man7',
-+        'qemu-qmp-ref.7': 'man7',
-+    },
-+    'tools': {
-+        'qemu-img.1': (have_tools ? 'man1' : ''),
-+        'qemu-nbd.8': (have_tools ? 'man8' : ''),
-+        'qemu-trace-stap.1': (config_host.has_key('CONFIG_TRACE_SYSTEMTAP') ? 'man1' : ''),
-+        'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''),
-+        'virtiofsd.1': (have_virtiofsd ? 'man1' : ''),
-+    },
-+    'system': {
-+        'qemu.1': 'man1',
-+        'qemu-block-drivers.7': 'man7',
-+        'qemu-cpu-models.7': 'man7'
-+    },
-+  }
-+
-+  sphinxmans = []
-+  foreach manual : manuals
-+    private_dir = meson.current_build_dir() / (manual + '.p')
-+    output_dir = meson.current_build_dir() / manual
-+    input_dir = meson.current_source_dir() / manual
-+
-+    these_man_pages = []
-+    install_dirs = []
-+    foreach page, section : man_pages.get(manual, {})
-+      these_man_pages += page
-+      install_dirs += section == '' ? false : get_option('mandir') / section
-+    endforeach
-+    if these_man_pages.length() > 0
-+      sphinxmans += custom_target(manual + ' man pages',
-+                         build_by_default: build_docs,
-+                         output: these_man_pages,
-+                         input: this_manual,
-+                         install: build_docs,
-+                         install_dir: install_dirs,
-+                         command: [SPHINX_ARGS, '-b', 'man', '-d', private_dir,
-+                                   input_dir, meson.current_build_dir()])
-+    endif
-+  endforeach
-   alias_target('man', sphinxmans)
- endif
diff --git a/emulators/qemu-devel/files/patch-docs_system_qemu-cpu-models.rst b/emulators/qemu-devel/files/patch-docs_system_qemu-cpu-models.rst
index ed263998422e..829daf378ce9 100644
--- a/emulators/qemu-devel/files/patch-docs_system_qemu-cpu-models.rst
+++ b/emulators/qemu-devel/files/patch-docs_system_qemu-cpu-models.rst
@@ -1,8 +1,8 @@
---- docs/system/qemu-cpu-models.rst.orig	2020-07-28 20:52:47 UTC
+--- docs/system/qemu-cpu-models.rst.orig	2021-09-27 14:03:42 UTC
 +++ docs/system/qemu-cpu-models.rst
-@@ -17,4 +17,4 @@ Description
+@@ -21,4 +21,4 @@ Description
  See also
- ''''''''
+ --------
  
 -The HTML documentation of QEMU for more precise information and Linux user mode emulator invocation.
 +The HTML documentation of QEMU for more precise information and Linux user mode emulator invocation, as well as the FreeBSD host notes in pkg-message in the relevant qemu port directory.
diff --git a/emulators/qemu-devel/files/patch-net_tap-bsd.c b/emulators/qemu-devel/files/patch-net_tap-bsd.c
deleted file mode 100644
index 6d94c1bde1ca..000000000000
--- a/emulators/qemu-devel/files/patch-net_tap-bsd.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- net/tap-bsd.c.orig	2019-04-23 18:14:46 UTC
-+++ net/tap-bsd.c
-@@ -31,6 +31,7 @@
- 
- #if defined(__NetBSD__) || defined(__FreeBSD__)
- #include <sys/ioctl.h>
-+#include <sys/socket.h>
- #include <net/if.h>
- #include <net/if_tap.h>
- #endif