diff options
| author | Dudemanguy <random342@airmail.cc> | 2022-01-08 12:03:30 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2022-01-09 16:34:50 +0000 |
| commit | d77b30abceb88160f5c67f58ce27f45dfe5c8b4f (patch) | |
| tree | eeddee5c918e85a3756c7aca4258f027fc52f57e | |
| parent | 5ac8f85d3d9f8254923abedd0c7e7746e6c92737 (diff) | |
| download | mpv-d77b30abceb88160f5c67f58ce27f45dfe5c8b4f.tar.bz2 mpv-d77b30abceb88160f5c67f58ce27f45dfe5c8b4f.tar.xz | |
meson: remove iconv hacks and bump req. version
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.
| -rw-r--r-- | meson.build | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/meson.build b/meson.build index a04fda3172..d5d3409337 100644 --- a/meson.build +++ b/meson.build @@ -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' |