From cec90050b068bacfee883a38d4ccf477c646f98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 16 Aug 2018 11:08:38 +0100 Subject: [PATCH] meson: gl: find libjpeg via pkg-config This effectively (but optionally) requires libjpeg-turbo which ships with a .pc file and is what pretty much everyone these days uses anyway for libjpeg, so shouldn't be a problem hopefully. https://bugzilla.gnome.org/show_bug.cgi?id=796947 --- ext/gl/meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ext/gl/meson.build b/ext/gl/meson.build index 7eba0b31b1..eda2bf4e61 100644 --- a/ext/gl/meson.build +++ b/ext/gl/meson.build @@ -72,10 +72,7 @@ if graphene_dep.found() endif png_dep = dependency('libpng', version : '>=1.0', required : get_option('gl-png')) -jpeg_dep = cc.find_library('jpeg-mmx', required : false) -if not jpeg_dep.found() - jpeg_dep = cc.find_library('jpeg', required : get_option('gl-jpeg')) -endif +jpeg_dep = dependency('libjpeg', required : get_option('gl-jpeg')) if png_dep.found() optional_deps += png_dep