FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Revert "openjpeg: Support building with openjpeg 2.3"

Browse Source 
This reverts commit ef4d6b93e6078b7056c51a928f5620b13e55e323.

A better fix follows.

https://bugzilla.gnome.org/show_bug.cgi?id=788703
This commit is contained in:
Jan Alexander Steffens (heftig) 2017-10-19 16:26:45 +02:00 committed by Sebastian Dröge
parent 9cff4f69cb
commit d1cbeb4fe7
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -2874,11 +2874,6 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [
AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_2, libopenjp2 >= 2.2) AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_2, libopenjp2 >= 2.2)
if test x"$HAVE_OPENJPEG_2_2" = x"yes"; then if test x"$HAVE_OPENJPEG_2_2" = x"yes"; then
AC_DEFINE([HAVE_OPENJPEG_2_2], 1, [Define if OpenJPEG 2.2 is used]) AC_DEFINE([HAVE_OPENJPEG_2_2], 1, [Define if OpenJPEG 2.2 is used])
AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_3, libopenjp2 >= 2.3 libopenjp2 < 2.4)
if test x"$HAVE_OPENJPEG_2_3" = x"yes"; then
AC_DEFINE([HAVE_OPENJPEG_2_3], 1, [Define if OpenJPEG 2.3 is used])
fi
fi fi
fi fi
else else

4
ext/openjpeg/gstopenjpeg.h
View File

@ -38,9 +38,7 @@
#define OPJ_CPRL CPRL #define OPJ_CPRL CPRL
#else #else
#include <stdio.h> #include <stdio.h>
# if defined(HAVE_OPENJPEG_2_3) # if defined(HAVE_OPENJPEG_2_2)
# include <openjpeg-2.3/openjpeg.h>
# elif defined(HAVE_OPENJPEG_2_2)
# include <openjpeg-2.2/openjpeg.h> # include <openjpeg-2.2/openjpeg.h>
# elif defined(HAVE_OPENJPEG_2_1) # elif defined(HAVE_OPENJPEG_2_1)
# include <openjpeg-2.1/openjpeg.h> # include <openjpeg-2.1/openjpeg.h>

19
ext/openjpeg/meson.build
View File

@ -6,23 +6,22 @@ openjpeg_sources = [
openjpeg_cargs = [] openjpeg_cargs = []
max_supported_version = '<2.4' # Check for 2.2, 2.1, then 2.0
supported_versions = [ '2.3', '2.2', '2.1' ] openjpeg_dep = dependency('libopenjp2', version : '>=2.2', required : false)
foreach version: supported_versions if openjpeg_dep.found()
openjpeg_dep = dependency('libopenjp2', version : ['>=' + version, max_supported_version], openjpeg_cargs += ['-DHAVE_OPENJPEG_2_2', '-DHAVE_OPENJPEG_2_1']
required : false) else
openjpeg_dep = dependency('libopenjp2', version : '>=2.1', required : false)
if openjpeg_dep.found() if openjpeg_dep.found()
openjpeg_cargs += ['-DHAVE_OPENJPEG_' + version.underscorify()] openjpeg_cargs += ['-DHAVE_OPENJPEG_2_1']
endif else
endforeach
if not openjpeg_dep.found()
openjpeg_dep = dependency('libopenjp2', required : false) openjpeg_dep = dependency('libopenjp2', required : false)
# Fallback to 1.5 # Fallback to 1.5
if not openjpeg_dep.found() if not openjpeg_dep.found()
openjpeg_dep = dependency('libopenjpeg1', required : false) openjpeg_dep = dependency('libopenjpeg1', required : false)
openjpeg_cargs += ['-DHAVE_OPENJPEG_1'] openjpeg_cargs += ['-DHAVE_OPENJPEG_1']
endif endif
endif
endif endif
if openjpeg_dep.found() if openjpeg_dep.found()