From 7161a43395c19206f1536b94b72cf7a90677275b Mon Sep 17 00:00:00 2001 From: Volker Rümelin Date: Sat, 29 Aug 2020 12:41:58 +0200 Subject: meson: fix SDL2_image detection 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 Message-Id: <20200829104158.7461-1-vr_qemu@t-online.de> Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meson.build') 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() -- cgit v1.2.3-55-g7522