Skip to content

M
mpd
Commit 6f242836 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

lib/xiph/meson.build: fix typo, replace `and` with `or`

Fixes linker failure when building without FLAC support. Closes #400
parent f2c926f3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
NEWS
View file @ 6f242836
...@@ -3,6 +3,7 @@ ver 0.21.1 (not yet released) ...@@ -3,6 +3,7 @@ ver 0.21.1 (not yet released)
- allow escaping quotes in filter expressions - allow escaping quotes in filter expressions
* decoder * decoder
- ffmpeg: fix build failure with non-standard FFmpeg installation path - ffmpeg: fix build failure with non-standard FFmpeg installation path
- flac: fix linker failure when building without FLAC support
* fix build failure on Linux-PowerPC * fix build failure on Linux-PowerPC
* fix build failure on FreeBSD * fix build failure on FreeBSD
* eliminate DLL dependencies on Windows * eliminate DLL dependencies on Windows
......
src/lib/xiph/meson.build
View file @ 6f242836
...@@ -14,7 +14,7 @@ else ...@@ -14,7 +14,7 @@ else
libogg_dep = dependency('', required: false) libogg_dep = dependency('', required: false)
endif endif
if not libogg_dep.found() or not libflac_dep.found() if not libogg_dep.found() and not libflac_dep.found()
xiph_dep = dependency('', required: false) xiph_dep = dependency('', required: false)
ogg_dep = dependency('', required: false) ogg_dep = dependency('', required: false)
flac_dep = dependency('', required: false) flac_dep = dependency('', required: false)
......
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