aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2017-08-08 11:32:47 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-08-08 11:46:35 +0900
commitdb29ee1cd686f4d58f1a13eb8eb0177d5ddd8be8 (patch)
tree383ba3af7b59a129a3168c9b2c439a6ba395ae81 /m4
parenteo: Fix memory leak with overrides (diff)
downloadefl-db29ee1cd686f4d58f1a13eb8eb0177d5ddd8be8.tar.gz
Evas Jpeg2000 loader: port it to openjpeg 2.*
Test Plan: files in https://github.com/uclouvain/openjpeg-data/tree/master/baseline/nonregression Reviewers: jpeg, raster, cedric Differential Revision: https://phab.enlightenment.org/D5033
Diffstat (limited to 'm4')
-rw-r--r--m4/evas_check_loader.m416
1 files changed, 3 insertions, 13 deletions
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index b574931c27..3ac4d5901e 100644
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -273,7 +273,7 @@ AC_CHECK_HEADER([openjpeg.h], [have_dep="yes"])
if test "x${have_dep}" = "xyes" ; then
AC_CHECK_LIB([openjp2],
- [opj_cio_open],
+ [opj_stream_create],
[
evas_image_loader_[]$1[]_libs="-lopenjp2"
have_dep="yes"
@@ -282,21 +282,11 @@ if test "x${have_dep}" = "xyes" ; then
fi
if test "x${have_dep}" = "xno" ; then
- PKG_CHECK_EXISTS([libopenjpeg1 >= 1.5],
+ PKG_CHECK_EXISTS([libopenjp2 >= 2.0],
[
have_dep="yes"
have_dep_pc="yes"
- requirement="libopenjpeg1 >= 1.5"
- ],
- [have_dep="no"])
-fi
-
-if test "x${have_dep}" = "xno" ; then
- PKG_CHECK_EXISTS([libopenjpeg >= 1.5],
- [
- have_dep="yes"
- have_dep_pc="yes"
- requirement="libopenjpeg >= 1.5"
+ requirement="libopenjp2 >= 2.0"
],
[have_dep="no"])
fi