From 8305cb2995a8f842b488494574546880bf3bf95a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 18 Aug 2018 21:01:52 +0100 Subject: [PATCH] meson: 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 --- REQUIREMENTS | 2 +- ext/jpeg/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/REQUIREMENTS b/REQUIREMENTS index 140e824..ee00920 100644 --- a/REQUIREMENTS +++ b/REQUIREMENTS @@ -110,7 +110,7 @@ Notes: This dependency is entirely optional, the video4linux plugin Package: JPEG library Plugins: jpeg (jpegenc, jpegdec, smokeenc, smokedec) -DebianPackage: libjpeg-dev +DebianPackage: libjpeg62-turbo-dev URL: http://www.libjpeg-turbo.org/ or http://www.ijg.org/ for the IJG version diff --git a/ext/jpeg/meson.build b/ext/jpeg/meson.build index 2222491..817bdbe 100644 --- a/ext/jpeg/meson.build +++ b/ext/jpeg/meson.build @@ -4,7 +4,7 @@ jpeg_sources = [ 'gstjpegdec.c', ] -jpeglib = cc.find_library('jpeg', required : get_option('jpeg')) +jpeglib = dependency('libjpeg', required : get_option('jpeg')) if jpeglib.found() gstjpeg = library('gstjpeg', -- 2.7.4