summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2024-03-23 19:59:58 +0100
committersfan5 <sfan5@live.de>2024-03-26 12:59:59 +0100
commitaf69b268c25f07c46aa3c0963a6819846ca23470 (patch)
tree63c9da6e10fcdfb0be1aec1839ed66e21423950d
parent7ccb1cbcd46187a9f2684827f30be911b0339ff5 (diff)
downloadmpv-af69b268c25f07c46aa3c0963a6819846ca23470.tar.bz2
mpv-af69b268c25f07c46aa3c0963a6819846ca23470.tar.xz
meson: remove some unneeded features from list
There's no practical use in knowing that e.g. mpv was linked to libm and these are not used for HAVE_* tests either.
-rw-r--r--meson.build21
1 files changed, 5 insertions, 16 deletions
diff --git a/meson.build b/meson.build
index c471d5d7b5..61d88d9c0f 100644
--- a/meson.build
+++ b/meson.build
@@ -47,7 +47,6 @@ features = {
'jpegxl': libavformat.version().version_compare('>= 59.27.100'),
'avif-muxer': libavformat.version().version_compare('>= 59.24.100'),
'libass': true,
- 'threads': true,
'libplacebo': true,
}
@@ -327,19 +326,14 @@ if posix
flags += ['-D_GNU_SOURCE']
endif
-noexecstack = false
if cc.has_link_argument('-Wl,-z,noexecstack')
link_flags += '-Wl,-z,noexecstack'
- noexecstack = true
endif
if cc.has_link_argument('-Wl,--nxcompat,--no-seh,--dynamicbase')
link_flags += '-Wl,--nxcompat,--no-seh,--dynamicbase'
- noexecstack = true
endif
-features += {'noexecstack': noexecstack}
-
features += {'build-date': get_option('build-date')}
if not features['build-date']
flags += '-DNO_BUILD_TIMESTAMPS'
@@ -676,14 +670,12 @@ if features['libbluray']
endif
libm = cc.find_library('m', required: false)
-features += {'libm': libm.found()}
-if features['libm']
+if libm.found()
dependencies += libm
endif
librt = cc.find_library('rt', required: false)
-features += {'librt': librt.found()}
-if features['librt']
+if librt.found()
dependencies += librt
endif
@@ -1575,8 +1567,7 @@ endif
# manpages
manpage = 'DOCS/man/mpv.rst'
rst2man = find_program('rst2man', 'rst2man.py', required: get_option('manpage-build'))
-features += {'manpage-build': rst2man.found()}
-if features['manpage-build']
+if rst2man.found()
mandir = get_option('mandir')
custom_target('manpages',
input: manpage,
@@ -1593,8 +1584,7 @@ if features['manpage-build']
endif
rst2html = find_program('rst2html', 'rst2html.py', required: get_option('html-build'))
-features += {'html-build': rst2html.found()}
-if features['html-build']
+if rst2html.found()
datadir = get_option('datadir')
custom_target('html-manpages',
input: manpage,
@@ -1610,8 +1600,7 @@ if features['html-build']
endif
rst2pdf = find_program('rst2pdf', required: get_option('pdf-build'))
-features += {'pdf-build': rst2pdf.found()}
-if features['pdf-build']
+if rst2pdf.found()
dependency_file = rst2pdf.version().version_compare('>=0.100')
datadir = get_option('datadir')
custom_target('pdf-manpages',