diff options
Diffstat (limited to 'community/mpd')
| -rwxr-xr-x | community/mpd/build | 2 | ||||
| -rw-r--r-- | community/mpd/checksums | 6 | ||||
| -rw-r--r-- | community/mpd/files/meson.build | 45 | ||||
| -rw-r--r-- | community/mpd/sources | 4 | ||||
| -rw-r--r-- | community/mpd/version | 2 |
5 files changed, 29 insertions, 30 deletions
diff --git a/community/mpd/build b/community/mpd/build index ea133674..47b60e3b 100755 --- a/community/mpd/build +++ b/community/mpd/build @@ -1,5 +1,7 @@ #!/bin/sh -e +clsed '/^directory =/s/=.*/= fmt/' subprojects/fmt.wrap + export DESTDIR="$1" cl-meson \ diff --git a/community/mpd/checksums b/community/mpd/checksums index 50945f14..65217595 100644 --- a/community/mpd/checksums +++ b/community/mpd/checksums @@ -1,4 +1,4 @@ %BLAKE3 -4e783abb79f4aa1ff431fa0ddbb69ab3906b44862f2ebfbc898e21041b82aac8 mpd-0.23.5.tar.xz -00b43eec8b8f3c39569826c91740fc6757853f3f4fd73a447d6c7409e544b95d 7.1.3.tar.gz -4a81799c5a19fa9afeb660fc293fcd12b1f076bc80c58e1a96841ea825ef8b75 meson.build +e6c42b1be58438c47272085746a792ade30860bf591ddb69ae2c6cee155c57a2 mpd-0.23.13.tar.xz +cf180e86ce5ea35914b2ac320cfc2f3b6337ef1aebd3934a7e75a809918b5812 9.1.0.tar.gz +a91e8415db32b59bb98205065a81a762cd047faf7b52441b697c35925287de80 meson.build diff --git a/community/mpd/files/meson.build b/community/mpd/files/meson.build index 39af6e87..21e1f2e2 100644 --- a/community/mpd/files/meson.build +++ b/community/mpd/files/meson.build @@ -1,34 +1,31 @@ -project('fmt', 'cpp', - version : '7.1.3', - license : 'BSD', - default_options : ['cpp_std=c++14'] -) +project('fmt', 'cpp', version: '9.1.0', license: 'BSD', default_options: ['cpp_std=c++14']) -fmt_private_cpp_args = [ ] -fmt_interface_cpp_args = [ ] -libtype = get_option('default_library') -if libtype == 'shared' - fmt_private_cpp_args += [ '-DFMT_EXPORT' ] - fmt_interface_cpp_args += [ '-DFMT_SHARED' ] +fmt_private_cpp_args = [] +fmt_interface_cpp_args = [] +if get_option('default_library') == 'shared' + fmt_private_cpp_args += ['-DFMT_EXPORT'] + fmt_interface_cpp_args += ['-DFMT_SHARED'] endif -fmt_inc = include_directories('include') -fmt_lib = library('fmt', - sources : [ - 'src/format.cc', - 'src/os.cc' - ], - cpp_args : fmt_private_cpp_args, - include_directories : fmt_inc +fmt_lib = library( + 'fmt', + 'src/format.cc', + 'src/os.cc', + cpp_args: fmt_private_cpp_args, + include_directories: 'include', ) fmt_dep = declare_dependency( - include_directories : fmt_inc, - compile_args : fmt_interface_cpp_args, - link_with : fmt_lib + include_directories: 'include', + compile_args: fmt_interface_cpp_args, + link_with: fmt_lib, ) +if meson.version().version_compare('>=0.54.0') + meson.override_dependency('fmt', fmt_dep) +endif + fmt_header_only_dep = declare_dependency( - include_directories : fmt_inc, - compile_args : '-DFMT_HEADER_ONLY' + include_directories: 'include', + compile_args: '-DFMT_HEADER_ONLY', ) diff --git a/community/mpd/sources b/community/mpd/sources index 5d081f47..49d3e2f6 100644 --- a/community/mpd/sources +++ b/community/mpd/sources @@ -1,3 +1,3 @@ -https://www.musicpd.org/download/mpd/0.23/mpd-0.23.5.tar.xz -https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz subprojects/fmt +https://www.musicpd.org/download/mpd/0.23/mpd-0.23.13.tar.xz +https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz subprojects/fmt files/meson.build subprojects/fmt diff --git a/community/mpd/version b/community/mpd/version index 318ef6d4..cdd9e76a 100644 --- a/community/mpd/version +++ b/community/mpd/version @@ -1 +1 @@ -0.23.5 2 +0.23.13 1 |