summaryrefslogtreecommitdiffstats
path: root/DOCS/man/input.rst
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2023-02-20 19:34:02 -0600
committerDudemanguy <random342@airmail.cc>2023-04-11 20:05:36 +0000
commit3c1686488b48bd2760e9b19f42e7d3be1363d00a (patch)
treea3976a8eb329421d0aa116423165dccc51fb4532 /DOCS/man/input.rst
parentd65e56216d2bb3f2a4b65922f48192be6a691152 (diff)
downloadmpv-3c1686488b48bd2760e9b19f42e7d3be1363d00a.tar.bz2
mpv-3c1686488b48bd2760e9b19f42e7d3be1363d00a.tar.xz
meson: use the new build_options method
This finally allows us to put any user defined options into the CONFIGURATION variable like what waf does. The arbitrary hardcoded fallback is left in place for old meson versions. Also update the documentation in regards to the mpv-configuration variable to be relevant to meson.
Diffstat (limited to 'DOCS/man/input.rst')
-rw-r--r--DOCS/man/input.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index a06cc66a05..7125b8b312 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -3329,8 +3329,9 @@ Property list
might contain either a release version, or just a git hash.
``mpv-configuration``
- The configuration arguments which were passed to the build system
- (typically the way ``./waf configure ...`` was invoked).
+ The configuration arguments that were passed to the build system. If the
+ meson version used to compile mpv is older than 1.1.0, then a hardcoded
+ string of a few, arbitrary options is displayed instead.
``ffmpeg-version``
The contents of the ``av_version_info()`` API call. This is a string which