Newer meson versions added support for features that mpv has been using for a long time. Annoying fallbacks were left in place to not break old versions but ideally everyone should be using the newer build features. Both the latest ubuntu LTS and debian stable (in backports) have 1.5.0 in their repos, so go ahead and bump the version so we can drop some old code and let developers use newer meson features if applicable.
Unified · Split
| @@ -2,7 +2,7 @@ project('mpv', · 1 unmodified line | |||
| 2 | 'c', | 2 | 'c', |
| 3 | license: ['GPL2+', 'LGPL2.1+'], | 3 | license: ['GPL2+', 'LGPL2.1+'], |
| 4 | version: files('./MPV_VERSION'), | 4 | version: files('./MPV_VERSION'), |
| 5 | meson_version: '>=0.62.0', | 5 | meson_version: '>=1.3.0', |
| 6 | default_options: [ | 6 | default_options: [ |
| 7 | 'backend_max_links=16', | 7 | 'backend_max_links=16', |
| 8 | 'buildtype=debugoptimized', | 8 | 'buildtype=debugoptimized', |
| @@ -603,7 +603,8 @@ sources += [ebml_defs, ebml_types] · 594 unmodified lines | |||
| 603 | 603 | ||
| 604 | subdir('common') | 604 | subdir('common') |
| 605 | subdir('etc') | 605 | subdir('etc') |
| 606 | subdir('player') | 606 | subdir('player/javascript') |
| 607 | subdir('player/lua') | ||
| 607 | subdir('sub') | 608 | subdir('sub') |
| 608 | 609 | ||
| 609 | if darwin | 610 | if darwin |
| @@ -1684,20 +1685,9 @@ if rst2pdf.found() · 1074 unmodified lines | |||
| 1684 | endif | 1685 | endif |
| 1685 | 1686 | ||
| 1686 | 1687 | ||
| 1687 | if meson.version().version_compare('>= 1.1.0') | ||
| 1688 | configuration = meson.build_options() | ||
| 1689 | else | ||
| 1690 | # Arbitrary hardcoded things to pass if the meson version is too | ||
| 1691 | # old to have the build_options method. | ||
| 1692 | configuration = 'meson configure build ' + '-Dprefix=' + get_option('prefix') + \ | ||
| 1693 | ' -Dbuildtype=' + get_option('buildtype') + \ | ||
| 1694 | ' -Doptimization=' + get_option('optimization') | ||
| 1695 | endif | ||
| 1696 | |||
| 1697 | |||
| 1698 | # Set config.h | 1688 | # Set config.h |
| 1699 | conf_data = configuration_data() | 1689 | conf_data = configuration_data() |
| 1700 | conf_data.set_quoted('CONFIGURATION', configuration) | 1690 | conf_data.set_quoted('CONFIGURATION', meson.build_options()) |
| 1701 | conf_data.set_quoted('DEFAULT_DVD_DEVICE', dvd_device) | 1691 | conf_data.set_quoted('DEFAULT_DVD_DEVICE', dvd_device) |
| 1702 | conf_data.set_quoted('DEFAULT_CDROM_DEVICE', cd_device) | 1692 | conf_data.set_quoted('DEFAULT_CDROM_DEVICE', cd_device) |
| 1703 | 1693 | ||
| @@ -1813,8 +1803,7 @@ if get_option('cplayer') · 109 unmodified lines | |||
| 1813 | mpv = executable('mpv', main_fn_source, objects: libmpv.extract_all_objects(recursive: true), dependencies: dependencies, | 1803 | mpv = executable('mpv', main_fn_source, objects: libmpv.extract_all_objects(recursive: true), dependencies: dependencies, |
| 1814 | win_subsystem: 'windows', install: true) | 1804 | win_subsystem: 'windows', install: true) |
| 1815 | 1805 | ||
| 1816 | # Older meson versions generate this in the player subdirectory. | 1806 | if win32 |
| 1817 | if win32 and meson.version().version_compare('>= 1.3.0') | ||
| 1818 | wrapper_sources= 'osdep/win32-console-wrapper.c' | 1807 | wrapper_sources= 'osdep/win32-console-wrapper.c' |
| 1819 | executable('mpv', wrapper_sources, c_args: '-municode', link_args: '-municode', | 1808 | executable('mpv', wrapper_sources, c_args: '-municode', link_args: '-municode', |
| 1820 | name_suffix: 'com', install: true) | 1809 | name_suffix: 'com', install: true) |
| @@ -1,11 +0,0 @@ | |||
| 1 | subdir('javascript') | ||
| 2 | subdir('lua') | ||
| 3 | |||
| 4 | # Older versions of meson don't allow multiple build targets with the same name in the same | ||
| 5 | # file. Generate it here for compatibility reasons for windows. | ||
| 6 | if win32 and get_option('cplayer') and meson.version().version_compare('< 1.3.0') | ||
| 7 | wrapper_sources= '../osdep/win32-console-wrapper.c' | ||
| 8 | executable('mpv', wrapper_sources, c_args: '-municode', link_args: '-municode', | ||
| 9 | name_suffix: 'com', install: true) | ||
| 10 | warning('mpv.com executable will be generated in the player subdirectory.') | ||
| 11 | endif | ||