[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/24] meson: fix SDL2_image detection
From: |
Paolo Bonzini |
Subject: |
[PULL 03/24] meson: fix SDL2_image detection |
Date: |
Tue, 1 Sep 2020 05:11:11 -0400 |
From: Volker RĂ¼melin <vr_qemu@t-online.de>
Configure used to probe for SDL2_image in sdl_image_probe (). Meson
should do the same.
This fixes the following error on my system:
Run-time dependency sdl2 found: YES 2.0.8
Found CMake: /usr/bin/cmake (3.17.0)
Run-time dependency sdl-image found: NO (tried pkgconfig and cmake)
../qemu-master/meson.build:256:2: ERROR: Dependency "sdl-image" not
found, tried pkgconfig and cmake
A full log can be found at /home/ruemelin/rpmbuild/BUILD
/qemu-5.1.50-build/meson-logs/meson-log.txt
ERROR: meson setup failed
Signed-off-by: Volker RĂ¼melin <vr_qemu@t-online.de>
Message-Id: <20200829104158.7461-1-vr_qemu@t-online.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 1e7aee85e3..3c919e32f1 100644
--- a/meson.build
+++ b/meson.build
@@ -248,7 +248,7 @@ if sdl.found()
# work around 2.0.8 bug
sdl = declare_dependency(compile_args: '-Wno-undef',
dependencies: sdl)
- sdl_image = dependency('sdl-image', required: get_option('sdl_image'),
+ sdl_image = dependency('SDL2_image', required: get_option('sdl_image'),
static: enable_static)
else
if get_option('sdl_image').enabled()
--
2.26.2
- [PULL 00/24] Meson changes for 2020-09-01, Paolo Bonzini, 2020/09/01
- [PULL 02/24] block: always link with zlib, Paolo Bonzini, 2020/09/01
- [PULL 01/24] meson: bump submodule to 0.55.1, Paolo Bonzini, 2020/09/01
- [PULL 03/24] meson: fix SDL2_image detection,
Paolo Bonzini <=
- [PULL 05/24] meson: install scripts/qemu-trace-stap, Paolo Bonzini, 2020/09/01
- [PULL 04/24] meson: install pc-bios blobs, Paolo Bonzini, 2020/09/01
- [PULL 06/24] meson: install icons, Paolo Bonzini, 2020/09/01
- [PULL 09/24] build-sys: remove install target from Makefile, Paolo Bonzini, 2020/09/01
- [PULL 08/24] meson: install $localstatedir/run for qga, Paolo Bonzini, 2020/09/01
- [PULL 11/24] configure: rename confsuffix option, Paolo Bonzini, 2020/09/01
- [PULL 07/24] meson: install desktop file, Paolo Bonzini, 2020/09/01
- [PULL 10/24] meson: move zlib detection to meson, Paolo Bonzini, 2020/09/01
- [PULL 12/24] configure: always /-seperate directory from qemu_suffix, Paolo Bonzini, 2020/09/01
- [PULL 14/24] meson: pass qemu_suffix option, Paolo Bonzini, 2020/09/01