Commit a9c704b7 authored by Max Kellermann's avatar Max Kellermann

meson.build: libfmt integration

parent 0cca1b13
...@@ -11,6 +11,7 @@ jobs: ...@@ -11,6 +11,7 @@ jobs:
- meson - meson
- libgtest-dev - libgtest-dev
- libboost-dev - libboost-dev
- libfmt-dev
# Ubuntu Focal (20.04) with GCC 9.3 on big-endian # Ubuntu Focal (20.04) with GCC 9.3 on big-endian
- os: linux - os: linux
...@@ -22,6 +23,7 @@ jobs: ...@@ -22,6 +23,7 @@ jobs:
- meson - meson
- libgtest-dev - libgtest-dev
- libboost-dev - libboost-dev
- libfmt-dev
# Ubuntu Focal (20.04) with GCC 9.3 on ARM64 # Ubuntu Focal (20.04) with GCC 9.3 on ARM64
- os: linux - os: linux
...@@ -33,6 +35,7 @@ jobs: ...@@ -33,6 +35,7 @@ jobs:
- meson - meson
- libgtest-dev - libgtest-dev
- libboost-dev - libboost-dev
- libfmt-dev
# Ubuntu Trusty (16.04) with GCC 8 # Ubuntu Trusty (16.04) with GCC 8
- os: linux - os: linux
...@@ -67,6 +70,7 @@ jobs: ...@@ -67,6 +70,7 @@ jobs:
packages: packages:
- ccache - ccache
- meson - meson
- fmt
- googletest - googletest
- icu4c - icu4c
- ffmpeg - ffmpeg
......
...@@ -12,6 +12,7 @@ ver 0.23 (not yet released) ...@@ -12,6 +12,7 @@ ver 0.23 (not yet released)
- snapcast: new plugin - snapcast: new plugin
* tags * tags
- new tags "ComposerSort", "Ensemble", "Movement", "MovementNumber", and "Location" - new tags "ComposerSort", "Ensemble", "Movement", "MovementNumber", and "Location"
* new build-time dependency: libfmt
ver 0.22.8 (2021/05/22) ver 0.22.8 (2021/05/22)
* fix crash bug in "albumart" command (0.22.7 regression) * fix crash bug in "albumart" command (0.22.7 regression)
......
...@@ -69,6 +69,7 @@ For example, the following installs a fairly complete list of build dependencies ...@@ -69,6 +69,7 @@ For example, the following installs a fairly complete list of build dependencies
.. code-block:: none .. code-block:: none
apt install meson g++ \ apt install meson g++ \
libfmt-dev \
libpcre3-dev \ libpcre3-dev \
libmad0-dev libmpg123-dev libid3tag0-dev \ libmad0-dev libmpg123-dev libid3tag0-dev \
libflac-dev libvorbis-dev libopus-dev libogg-dev \ libflac-dev libvorbis-dev libopus-dev libogg-dev \
......
...@@ -223,6 +223,8 @@ if boost_dep.version() == '1.67' ...@@ -223,6 +223,8 @@ if boost_dep.version() == '1.67'
warning('Your Boost version 1.67 is known to be buggy, and the MPD build will fail. Please upgrade to Boost 1.68 or later.') warning('Your Boost version 1.67 is known to be buggy, and the MPD build will fail. Please upgrade to Boost 1.68 or later.')
endif endif
fmt_dep = dependency('fmt')
log = static_library( log = static_library(
'log', 'log',
'src/Log.cxx', 'src/Log.cxx',
...@@ -527,6 +529,7 @@ mpd = build_target( ...@@ -527,6 +529,7 @@ mpd = build_target(
zeroconf_dep, zeroconf_dep,
more_deps, more_deps,
chromaprint_dep, chromaprint_dep,
fmt_dep,
], ],
link_args: link_args, link_args: link_args,
build_by_default: not get_option('fuzzer'), build_by_default: not get_option('fuzzer'),
......
/packagecache/ /packagecache/
/fmt-*/
/googletest-*/ /googletest-*/
[wrap-file]
directory = fmt-7.1.3
source_url = https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz
source_filename = fmt-7.1.3.tar.gz
source_hash = 5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/7.1.3/1/get_zip
patch_filename = fmt-7.1.3-1-wrap.zip
patch_hash = 6eb951a51806fd6ffd596064825c39b844c1fe1799840ef507b61a53dba08213
[provide]
fmt = fmt_dep
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment