Commit db8f3845 authored by Matthew Brett's avatar Matthew Brett
Browse files

Refactor openjpeg dependencies

Add openjpeg dependencies to openjpeg build recipe.

Remove openjpeg as dependency for tiff (doesn't appear to be found during tiff
build).
parent 3381dc0c
...@@ -111,7 +111,6 @@ function build_bzip2 { ...@@ -111,7 +111,6 @@ function build_bzip2 {
function build_tiff { function build_tiff {
build_zlib build_zlib
build_jpeg build_jpeg
build_openjpeg
build_xz build_xz
build_simple tiff $TIFF_VERSION http://download.osgeo.org/libtiff build_simple tiff $TIFF_VERSION http://download.osgeo.org/libtiff
} }
...@@ -129,6 +128,10 @@ function get_cmake { ...@@ -129,6 +128,10 @@ function get_cmake {
function build_openjpeg { function build_openjpeg {
if [ -e openjpeg-stamp ]; then return; fi if [ -e openjpeg-stamp ]; then return; fi
build_zlib
build_libpng
build_tiff
build_lcms2
local cmake=$(get_cmake) local cmake=$(get_cmake)
fetch_unpack https://github.com/uclouvain/openjpeg/archive/version.${OPENJPEG_VERSION}.tar.gz fetch_unpack https://github.com/uclouvain/openjpeg/archive/version.${OPENJPEG_VERSION}.tar.gz
(cd openjpeg-version.${OPENJPEG_VERSION} \ (cd openjpeg-version.${OPENJPEG_VERSION} \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment