RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 00:19:32 +00:00
Code Issues Releases Wiki Activity

meson: remove iconv hacks and bump req. version

Browse Source 
There was some breakage with regards to the iconv detection in some
older meson versions. This was all settled in 0.60.3 and now it simply
just works. Remove the workarounds and bump the needed meson version to
0.60.3.
This commit is contained in:
Dudemanguy 2022-01-08 12:03:30 -06:00
parent 5ac8f85d3d
commit d77b30abce
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -2,7 +2,7 @@ project('mpv',
'c',
license: ['GPL2+', 'LGPL2.1+'],
version: files('./VERSION'),
meson_version: '>=0.60.0',
meson_version: '>=0.60.3',
default_options: [
'buildtype=debugoptimized',
'b_lundef=false',
@ -639,15 +639,7 @@ if dvdnav.found() and dvdread.found()
sources += files('stream/stream_dvdnav.c')
endif
#TODO: remove this crap one day.
#Freebsd requires 0.60.2 or up to work without specifying the method.
#Windows breaks on exactly 0.60.2 (will have to wait for 0.60.3).
if host_machine.system() == 'freebsd' or host_machine.system() == 'windows'
iconv_method = 'system'
else
iconv_method = 'auto'
endif
iconv = dependency('iconv', method: iconv_method, required: get_option('iconv'))
iconv = dependency('iconv', required: get_option('iconv'))
if iconv.found()
dependencies += iconv
features += 'iconv'