diff options
author | Přemysl Eric Janouch <p@janouch.name> | 2022-01-18 23:35:14 +0100 |
---|---|---|
committer | Přemysl Eric Janouch <p@janouch.name> | 2022-01-19 01:11:47 +0100 |
commit | 45238d78cd9535b33bfbeeaaac4645af1bd93834 (patch) | |
tree | 13f9e3d1d69dbc563e9c77dd44f22d117a5614d7 /meson.build | |
parent | 8a656121a392c16428a05e27d6a33a7923e1b0b2 (diff) | |
download | fiv-45238d78cd9535b33bfbeeaaac4645af1bd93834.tar.gz fiv-45238d78cd9535b33bfbeeaaac4645af1bd93834.tar.xz fiv-45238d78cd9535b33bfbeeaaac4645af1bd93834.zip |
Mesonize JPEG Quant Smooth
Now SIMD works on amd64, although the build remains questionable,
because it assumes that all of its compiler flags will work.
This way we lose an uncomfortable git submodule.
Also, add Meson subprojects to .gitignore.
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/meson.build b/meson.build index cab46ad..0ccc8cd 100644 --- a/meson.build +++ b/meson.build @@ -17,6 +17,12 @@ add_project_arguments( # add_project_link_arguments(flags, language : ['c']) #endif +# The likelihood of this being installed is nearly zero. Enable the wrap. +libjpegqs = dependency('libjpegqs', + required : get_option('libjpegqs'), + allow_fallback : true, +) + lcms2 = dependency('lcms2', required : get_option('lcms2')) # Note that only libraw_r is thread-safe, but we'll just run it out-of process. libraw = dependency('libraw', required : get_option('libraw')) @@ -30,7 +36,6 @@ dependencies = [ dependency('pixman-1'), dependency('libturbojpeg'), - dependency('libjpeg', required : get_option('jpeg-qs')), dependency('libwebp'), dependency('libwebpdemux'), dependency('libwebpdecoder', required : false), @@ -42,6 +47,7 @@ dependencies = [ ), lcms2, + libjpegqs, libraw, librsvg, xcursor, @@ -54,8 +60,7 @@ dependencies = [ conf = configuration_data() conf.set_quoted('PROJECT_NAME', meson.project_name()) conf.set_quoted('PROJECT_VERSION', meson.project_version()) -# TODO(p): Wrap it in a Meson subproject, try to enable SIMD. -conf.set('HAVE_JPEG_QS', get_option('jpeg-qs').enabled()) +conf.set('HAVE_JPEG_QS', libjpegqs.found()) conf.set('HAVE_LCMS2', lcms2.found()) conf.set('HAVE_LIBRAW', libraw.found()) conf.set('HAVE_LIBRSVG', librsvg.found()) |