diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-10-19 16:36:17 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2017-12-01 09:22:30 +0100 |
| commit | 9376f6171ff6f651917776c34aa9df3397eaf090 (patch) | |
| tree | 099eddafab41175349d2cca749ca1e26e6e6f7b4 | |
| parent | 6f8b80eeb135053386db5d2473f3e990843f7607 (diff) | |
| download | gstreamer-plugins-bad-9376f6171ff6f651917776c34aa9df3397eaf090.tar.gz | |
openjpeg: Support building with openjpeg 2.3, simpler
OpenJPEG 2.3 installs its headers to /usr/include/openjpeg-2.3. However,
since libopenjp2.pc seems to provide the right includedir CFLAGS at
least since version 2.1, instead of adding yet another version check,
just remove the subdir and the check for 2.2.
https://bugzilla.gnome.org/show_bug.cgi?id=788703
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | ext/openjpeg/gstopenjpeg.h | 6 | ||||
| -rw-r--r-- | ext/openjpeg/meson.build | 20 |
3 files changed, 9 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 7a8d75224..f9727ac8d 100644 --- a/configure.ac +++ b/configure.ac @@ -2815,11 +2815,6 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [ AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_1, libopenjp2 >= 2.1) if test x"$HAVE_OPENJPEG_2_1" = x"yes"; then AC_DEFINE([HAVE_OPENJPEG_2_1], 1, [Define if OpenJPEG 2.1 is used]) - dnl include paths changed for v2.2 - AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_2, libopenjp2 >= 2.2) - if test x"$HAVE_OPENJPEG_2_2" = x"yes"; then - AC_DEFINE([HAVE_OPENJPEG_2_2], 1, [Define if OpenJPEG 2.2 is used]) - fi fi else # Fallback to v1.5 diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h index 52410a4f7..f9ca74a2f 100644 --- a/ext/openjpeg/gstopenjpeg.h +++ b/ext/openjpeg/gstopenjpeg.h @@ -38,10 +38,8 @@ #define OPJ_CPRL CPRL #else #include <stdio.h> -# if defined(HAVE_OPENJPEG_2_2) -# include <openjpeg-2.2/openjpeg.h> -# elif defined(HAVE_OPENJPEG_2_1) -# include <openjpeg-2.1/openjpeg.h> +# if defined(HAVE_OPENJPEG_2_1) +# include <openjpeg.h> # else # include <openjpeg-2.0/openjpeg.h> # endif diff --git a/ext/openjpeg/meson.build b/ext/openjpeg/meson.build index 0d97ebb9e..14b858317 100644 --- a/ext/openjpeg/meson.build +++ b/ext/openjpeg/meson.build @@ -6,21 +6,15 @@ openjpeg_sources = [ openjpeg_cargs = [] -# Check for 2.2, 2.1, then 2.0 -openjpeg_dep = dependency('libopenjp2', version : '>=2.2', required : false) +# 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_2', '-DHAVE_OPENJPEG_2_1'] + openjpeg_cargs += ['-DHAVE_OPENJPEG_2_1'] else - 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) - # Fallback to 1.5 - if not openjpeg_dep.found() - openjpeg_dep = dependency('libopenjpeg1', required : false) - openjpeg_cargs += ['-DHAVE_OPENJPEG_1'] - endif + openjpeg_dep = dependency('libopenjp2', required : false) + if not openjpeg_dep.found() + openjpeg_dep = dependency('libopenjpeg1', required : false) + openjpeg_cargs += ['-DHAVE_OPENJPEG_1'] endif endif |