diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-10-20 11:44:50 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2017-12-01 09:22:30 +0100 |
| commit | f2fe7e3045939a55baef6296a7facb810a449b27 (patch) | |
| tree | 7c3f6d4397f4038a2956356a2266d5b597da6b79 /ext/openjpeg/meson.build | |
| parent | 9376f6171ff6f651917776c34aa9df3397eaf090 (diff) | |
| download | gstreamer-plugins-bad-f2fe7e3045939a55baef6296a7facb810a449b27.tar.gz | |
openjpeg: Remove compatibility with openjpeg 2.0
Everyone seems to be shipping 2.1 as the oldest v2 version, even debian
oldstable (jessie).
Also remove an unneeded (debug?) #include <stdio.h>.
https://bugzilla.gnome.org/show_bug.cgi?id=788703
Diffstat (limited to 'ext/openjpeg/meson.build')
| -rw-r--r-- | ext/openjpeg/meson.build | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ext/openjpeg/meson.build b/ext/openjpeg/meson.build index 14b858317..dc64ec62b 100644 --- a/ext/openjpeg/meson.build +++ b/ext/openjpeg/meson.build @@ -6,16 +6,11 @@ openjpeg_sources = [ openjpeg_cargs = [] -# Check for 2.1, then 2.0, then 1.5 openjpeg_dep = dependency('libopenjp2', version : '>=2.1', required : false) -if openjpeg_dep.found() - openjpeg_cargs += ['-DHAVE_OPENJPEG_2_1'] -else - openjpeg_dep = dependency('libopenjp2', required : false) - if not openjpeg_dep.found() - openjpeg_dep = dependency('libopenjpeg1', required : false) - openjpeg_cargs += ['-DHAVE_OPENJPEG_1'] - endif +if not openjpeg_dep.found() + # Fallback to v1.5 + openjpeg_dep = dependency('libopenjpeg1', required : false) + openjpeg_cargs += ['-DHAVE_OPENJPEG_1'] endif if openjpeg_dep.found() |