Merging upstream version 1.10.

Signed-off-by: Daniel Baumann <daniel@debian.org>

scripts/build.sh

@@ -21,6 +21,7 @@ usage() {
     echo "                      and build them as shared libaries"
     echo "  cross               use cross toolchain to build"
     echo "  coverage            build coverage report"
+    echo "  docs                build documentation"
     echo ""
     echo "configs with muon:"
     echo "  [default]           minimal static build"
@@ -110,6 +111,13 @@ config_meson_coverage() {
         "${BUILDDIR}"
 }
 
+config_meson_docs() {
+    CC="${CC}" "${MESON}" setup                 \
+        -Ddocs=all                              \
+        -Ddocs-build=true                       \
+        "${BUILDDIR}"
+}
+
 build_meson() {
     "${MESON}" compile                          \
         -C "${BUILDDIR}"