From 50a67f5017b7e13ef12f41ccadcde7980c6c0111 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu Date: Sun, 27 Aug 2023 22:15:13 +0300 Subject: [PATCH 2/2] Fix libtiff to link with local libjpeg-turbo, reenable libjpeg there --- cinelerra-5.1/thirdparty/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 440f8f7b..b75858d5 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -253,8 +253,10 @@ openexr.cfg_vars?=true; \# openexr.mak_vars?=true; \# opus.cfg_params?= --disable-extra-programs speech_tools.mak_params?=-j1 +tiff.ldflags?="$(call ld_path,libjpeg,build)" +tiff.cflags?="$(call lnc_path,libjpeg)" tiff.cfg_vars+=LIBS+=" -lpthread"; autoreconf -ifv -I m4 && automake -caf; -tiff.cfg_params+= --disable-libdeflate --disable-jpeg --disable-lerc --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\ +tiff.cfg_params+= --disable-libdeflate --disable-lerc --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\ --with-webp-include-dir=$(call pkg_incl,libwebp)\ --with-webp-lib-dir=$(call pkg_libs,libwebp))\ $(call if_npkg,libwebp,--disable-webp) -- 2.42.0