From 27009dce11453223e4a1f65993851b09e7c263b6 Mon Sep 17 00:00:00 2001 Message-Id: <27009dce11453223e4a1f65993851b09e7c263b6.1508426064.git.jan.steffens@gmail.com> In-Reply-To: <573f9e0858c1be75b5a7c9a30a264e5148f91040.1508426064.git.jan.steffens@gmail.com> References: <573f9e0858c1be75b5a7c9a30a264e5148f91040.1508426064.git.jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" Date: Thu, 19 Oct 2017 16:36:17 +0200 Subject: [PATCH 2/2] 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 --- configure.ac | 5 ----- ext/openjpeg/gstopenjpeg.h | 6 ++---- ext/openjpeg/meson.build | 20 +++++++------------- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index 3745ed2468c23d6c..f558bbc1b1840c1c 100644 --- a/configure.ac +++ b/configure.ac @@ -2861,11 +2861,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 52410a4f7a4d4d2b..f9ca74a2f795c542 100644 --- a/ext/openjpeg/gstopenjpeg.h +++ b/ext/openjpeg/gstopenjpeg.h @@ -38,10 +38,8 @@ #define OPJ_CPRL CPRL #else #include -# if defined(HAVE_OPENJPEG_2_2) -# include -# elif defined(HAVE_OPENJPEG_2_1) -# include +# if defined(HAVE_OPENJPEG_2_1) +# include # else # include # endif diff --git a/ext/openjpeg/meson.build b/ext/openjpeg/meson.build index 0d97ebb9ee3a8d41..14b858317d155316 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 -- 2.14.2