From 16fbd5e83b5506612c01f903c07b21e85ecad06e Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Fri, 30 Apr 2021 16:27:01 -0400
Subject: Meson: Small fixes to dependency lookup

- When png/jpeg/tiff option is set to true it should abort when
  dependency cannot be found one way or another.
- Use libjpeg-turbo meson port instead of libjpeg from wrapdb to fix
  build on Windows.
- Rely on libpng.pc instead of checking each individual version.

Fixes: #182
---
 subprojects/libjpeg-turbo.wrap | 12 ++++++++++++
 subprojects/libjpeg.wrap       | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 subprojects/libjpeg-turbo.wrap
 delete mode 100644 subprojects/libjpeg.wrap

(limited to 'subprojects')

diff --git a/subprojects/libjpeg-turbo.wrap b/subprojects/libjpeg-turbo.wrap
new file mode 100644
index 000000000..f425824a9
--- /dev/null
+++ b/subprojects/libjpeg-turbo.wrap
@@ -0,0 +1,12 @@
+[wrap-file]
+directory = libjpeg-turbo-2.1.0
+source_url = https://sourceforge.net/projects/libjpeg-turbo/files/2.1.0/libjpeg-turbo-2.1.0.tar.gz
+source_filename = libjpeg-turbo-2.1.0.tar.gz
+source_hash = bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/libjpeg-turbo/2.1.0/1/get_zip
+patch_filename = libjpeg-turbo-2.1.0-1-wrap.zip
+patch_hash = 1bef2d46d99118d9693b8e248d2ae86a72f0651a74340ae925190c2a2f7d08c7
+
+[provide]
+dependency_names = libjpeg
+
diff --git a/subprojects/libjpeg.wrap b/subprojects/libjpeg.wrap
deleted file mode 100644
index 54a7fe624..000000000
--- a/subprojects/libjpeg.wrap
+++ /dev/null
@@ -1,12 +0,0 @@
-[wrap-file]
-directory = jpeg-9c
-source_url = http://ijg.org/files/jpegsrc.v9c.tar.gz
-source_filename = jpegsrc.v9c.tar.gz
-source_hash = 1e9793e1c6ba66e7e0b6e5fe7fd0f9e935cc697854d5737adec54d93e5b3f730
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/libjpeg/9c/3/get_zip
-patch_filename = libjpeg-9c-3-wrap.zip
-patch_hash = 2d66676d254be9198d8b6b62a798d6858c7f7cea9ed0e93809d6c035351a9bba
-
-[provide]
-libjpeg = jpeg_dep
-
-- 
cgit v1.2.1