| Message ID | 20200829104158.7461-1-vr_qemu@t-online.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | meson: fix SDL2_image detection | expand |
On 29/08/20 12:41, Volker Rümelin wrote: > 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> > --- > meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > index 74f8ea0c2e..8204878860 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() > Queued, thanks. Paolo
diff --git a/meson.build b/meson.build index 74f8ea0c2e..8204878860 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()
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> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)