[gegl] build: make libjpeg required dependency
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] build: make libjpeg required dependency
- Date: Fri, 26 Feb 2021 16:04:46 +0000 (UTC)
commit c869a1c33788b3ca1f1728487084ffe71e9706f4
Author: John <jtm home gmail com>
Date: Wed Feb 24 23:36:51 2021 +0000
build: make libjpeg required dependency
meson.build | 4 +---
meson_options.txt | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 01abced2a..e38ecd2ce 100644
--- a/meson.build
+++ b/meson.build
@@ -173,6 +173,7 @@ gio = [
dependency(gio_os, version: '>=2.44.0'),
]
json_glib = dependency('json-glib-1.0', version: '>=1.2.6')
+libjpeg = dependency('libjpeg', version: '>=1.0.0')
libpng = dependency('libpng', version: '>=1.6.0')
# Required libraries eventually provided in subprojects/ subdir
@@ -242,9 +243,6 @@ lcms = dependency('lcms2', version: '>=2.8',
lensfun = dependency('lensfun', version: '>=0.2.5',
required: get_option('lensfun')
)
-libjpeg = dependency('libjpeg', version: '>=1.0.0',
- required: get_option('libjpeg')
-)
libraw = dependency('libraw', version: '>=0.15.4',
required: get_option('libraw')
)
diff --git a/meson_options.txt b/meson_options.txt
index 273126ff8..3dd611819 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -35,7 +35,6 @@ option('jasper', type: 'feature', value: 'auto')
option('lcms', type: 'feature', value: 'auto')
option('lensfun', type: 'feature', value: 'auto')
option('libav', type: 'feature', value: 'auto')
-option('libjpeg', type: 'feature', value: 'auto')
option('libraw', type: 'feature', value: 'auto')
option('librsvg', type: 'feature', value: 'auto')
option('libspiro', type: 'feature', value: 'auto')
@@ -59,3 +58,4 @@ option('webp', type: 'feature', value: 'auto')
# obsolete - no effect
option('exiv2', type: 'feature', value: 'disabled')
option('libpng', type: 'feature', value: 'disabled')
+option('libjpeg', type: 'feature', value: 'disabled')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]