Merge pull request #270 from radarhere/turbo

multibuild now includes build_libjpeg_turbo
This commit is contained in:
Hugo van Kemenade 2022-03-25 23:37:15 +02:00 committed by GitHub
commit 55c6d6758c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 16 deletions

View File

@ -23,20 +23,6 @@ LIBWEBP_VERSION=1.2.2
BZIP2_VERSION=1.0.8
LIBXCB_VERSION=1.14
function build_libjpeg_turbo {
local cmake=$(get_modern_cmake)
fetch_unpack https://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-${JPEGTURBO_VERSION}.tar.gz
(cd libjpeg-turbo-${JPEGTURBO_VERSION} \
&& $cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib . \
&& make install)
if [ -n "$IS_MACOS" ]; then
rm /usr/local/lib/libjpeg.dylib
fi
# Prevent build_jpeg
touch jpeg-stamp
}
function build_giflib {
local name=giflib
local version=$GIFLIB_VERSION
@ -92,8 +78,9 @@ function pre_build {
fi
build_libjpeg_turbo
if [[ -n "$IS_MACOS" ]]; then
rm /usr/local/lib/libjpeg.dylib
TIFF_VERSION=4.2.0
fi
build_tiff

@ -1 +1 @@
Subproject commit b89bb903e94308be79abefa4f436bf123ebb1313
Subproject commit d0b05e7e7d3525690a077ea7b5536769f7e4ac23