From dc1f4a91dfefa9f86202ab148e05fb901b6e3e73 Mon Sep 17 00:00:00 2001 From: Eric Curtin Date: Tue, 19 Jul 2022 10:17:46 +0100 Subject: cam: sdl_sink: Use libjpeg over SDL2_image We were using the libjpeg functionality of SDL2_image only, instead just use libjpeg directly to reduce our dependancy count, it is a more commonly available library. Signed-off-by: Eric Curtin Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/cam/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/cam/meson.build') diff --git a/src/cam/meson.build b/src/cam/meson.build index 5957ce14..4dfa7b22 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -24,8 +24,8 @@ cam_sources = files([ cam_cpp_args = [] libdrm = dependency('libdrm', required : false) +libjpeg = dependency('libjpeg', required : false) libsdl2 = dependency('SDL2', required : false) -libsdl2_image = dependency('SDL2_image', required : false) if libdrm.found() cam_cpp_args += [ '-DHAVE_KMS' ] @@ -43,8 +43,8 @@ if libsdl2.found() 'sdl_texture_yuyv.cpp' ]) - if libsdl2_image.found() - cam_cpp_args += ['-DHAVE_SDL_IMAGE'] + if libjpeg.found() + cam_cpp_args += ['-DHAVE_LIBJPEG'] cam_sources += files([ 'sdl_texture_mjpg.cpp' ]) @@ -57,8 +57,8 @@ cam = executable('cam', cam_sources, libcamera_public, libdrm, libevent, + libjpeg, libsdl2, - libsdl2_image, libyaml, ], cpp_args : cam_cpp_args, -- cgit v1.2.1