oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Fixes linker failure when building without FLAC support.

Closes #400
This commit is contained in:
Max Kellermann 2018-11-04 11:36:28 +01:00
parent f2c926f3b6
commit 6f242836e6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -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

2
src/lib/xiph/meson.build
View File

@ -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)