emulators/qemu-devel: Update version 5.1.0.20200909=>5.1.0.20201010

- Fix plist when DOCS disabled [1]

PR:		250456 [1]
Reported by:	lwhsu [1]

2 files changed, 84 insertions, 20 deletions

diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure
index 1345fda4a379..e637e548f6c1 100644
--- a/emulators/qemu-devel/files/patch-configure
+++ b/emulators/qemu-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2020-09-08 20:21:13 UTC
+--- configure.orig	2020-10-19 09:52:57 UTC
 +++ configure
-@@ -1640,7 +1647,7 @@ if test "$mingw32" = "yes" ; then
+@@ -1534,7 +1534,7 @@ if test "$mingw32" = "yes" ; then
      sysconfdir="$prefix"
      local_statedir=
  else
@@ -9,7 +9,7 @@
      datadir="${datadir:-$prefix/share}"
      docdir="${docdir:-$prefix/share/doc}"
      bindir="${bindir:-$prefix/bin}"
-@@ -3279,6 +3286,14 @@ if check_include "sys/signal.h" ; then
+@@ -3112,6 +3112,14 @@ if check_include "sys/signal.h" ; then
  fi
  
  ##########################################
@@ -24,22 +24,7 @@
  # VTE probe
  
  if test "$vte" != "no"; then
-@@ -4870,14 +4885,6 @@ if test "$docs" != "no" ; then
-   fi
-   if has makeinfo && has pod2man && test "$sphinx_ok" = "yes"; then
-     docs=yes
--  else
--    if test "$docs" = "yes" ; then
--      if has $sphinx_build && test "$sphinx_ok" != "yes"; then
--        echo "Warning: $sphinx_build exists but it is either too old or uses too old a Python version" >&2
--      fi
--      feature_not_found "docs" "Install texinfo, Perl/perl-podlators and a Python 3 version of python-sphinx"
--    fi
--    docs=no
-   fi
- fi
- 
-@@ -4993,7 +5000,7 @@ fi
+@@ -4522,7 +4530,7 @@ fi
  
  # check for libusb
  if test "$libusb" != "no" ; then
@@ -48,7 +33,7 @@
          libusb="yes"
          libusb_cflags=$($pkg_config --cflags libusb-1.0)
          libusb_libs=$($pkg_config --libs libusb-1.0)
-@@ -6864,6 +6927,9 @@ fi
+@@ -6226,6 +6234,9 @@ fi
  # if this macro is set.
  if test "$have_fsxattr" = "yes" ; then
      echo "HAVE_FSXATTR=y" >> $config_host_mak
diff --git a/emulators/qemu-devel/files/patch-docs_meson.build b/emulators/qemu-devel/files/patch-docs_meson.build
new file mode 100644
index 000000000000..981e0eab746f
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-docs_meson.build
@@ -0,0 +1,79 @@
+--- 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