From: Tim-Philipp Müller <tim@centricular.com>
Date: Thu, 16 Aug 2018 10:08:38 +0000 (+0100)
Subject: meson: gl: find libjpeg via pkg-config
X-Git-Tag: 1.19.3~511^2~1531
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cec90050b068bacfee883a38d4ccf477c646f98d;p=platform%2Fupstream%2Fgstreamer.git

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
---

diff --git a/ext/gl/meson.build b/ext/gl/meson.build
index 7eba0b3..eda2bf4 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