From d2f6805c3f36718a742c33c56eb945c2e10646ef Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Thu, 26 Nov 2020 09:05:48 -0500
Subject: [PATCH] Meson: Fix doc build when opus is a subproject
meson.source_root() and meson.build_root() have been deprecated in
latest Meson release because they are a trap. They point to the root of
parent project instead of root of current subproject. Meson 0.56.0 added
meson.project_source/build_root() but it is just as easy to use
meson.current_source/build_dir() in the root meson.build file and avoids
bumping required meson version.
Signed-off-by: Ralph Giles <giles@thaumas.net>
---
doc/meson.build | 3 ---
meson.build | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/doc/meson.build b/doc/meson.build
index 8f967a510..ee42a2b02 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,6 +1,3 @@
-top_srcdir = meson.source_root()
-top_builddir = meson.build_root()
-
have_dot = find_program('dot', required: false).found()
doxyfile_conf = configuration_data()
diff --git a/meson.build b/meson.build
index 45fff3f25..41f69353f 100644
--- a/meson.build
+++ b/meson.build
@@ -11,6 +11,8 @@ macosversion = run_command('meson/get-version.py', '--darwin-version', check: tr
cc = meson.get_compiler('c')
host_system = host_machine.system()
host_cpu_family = host_machine.cpu_family()
+top_srcdir = meson.current_source_dir()
+top_builddir = meson.current_build_dir()
opus_includes = include_directories('.', 'include', 'celt', 'silk')
opus_public_includes = include_directories('include')
--
GitLab