From 6f242836e6ea5f9de303d4b0a0622d06580ea310 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 4 Nov 2018 11:36:28 +0100 Subject: [PATCH] lib/xiph/meson.build: fix typo, replace `and` with `or` Fixes linker failure when building without FLAC support. Closes #400 --- NEWS | 1 + src/lib/xiph/meson.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 8ff962a14..b6161eb57 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ ver 0.21.1 (not yet released) - allow escaping quotes in filter expressions * decoder - 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 FreeBSD * eliminate DLL dependencies on Windows diff --git a/src/lib/xiph/meson.build b/src/lib/xiph/meson.build index 66cd9464b..19dc64300 100644 --- a/src/lib/xiph/meson.build +++ b/src/lib/xiph/meson.build @@ -14,7 +14,7 @@ else libogg_dep = dependency('', required: false) 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) ogg_dep = dependency('', required: false) flac_dep = dependency('', required: false)