From 07d5f970a6e09384d907b0d5009ce858c49658e0 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu Date: Fri, 8 May 2026 21:50:21 +0000 Subject: [PATCH 5/5] Remove turbojpeg-specific library build from turbojpeg - not used by us. --- cinelerra-5.1/configure.ac | 3 +-- cinelerra-5.1/thirdparty/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 05499ad8..99014ce6 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -318,8 +318,7 @@ PKG_3RD([libdv],[auto], PKG_3RD([libjpeg],[auto], [libjpeg-turbo-3.0.4], - [ build/libjpeg.a \ - build/libturbojpeg.a ], + [ build/libjpeg.a ], [ opt/libjpeg-turbo/include ]) PKG_3RD([opus],[auto], diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index efe58c3c..9755c188 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -248,7 +248,7 @@ libiec61883.ldflags?="$(call ld_path,libraw1394,src/.libs)" libiec61883.cfg_params?= PKG_CONFIG_PATH="$(call bld_path,libraw1394)" --enable-shared=no libiec61883.mak_params?=; cd $(call bld_path,libiec61883,src); ln -sf . libiec61883 libjpeg.cfg_vars?= mkdir build && cd build && $(call cmake_config,..) -libjpeg.cfg_params?= -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib +libjpeg.cfg_params?= -DENABLE_SHARED=no -DWITH_TURBOJPEG=no -DCMAKE_INSTALL_LIBDIR=lib libjpeg.mak_params?= -C build all install DESTDIR=$(call bld_path,libjpeg) libogg.cfg_vars?= autoreconf -ifv -I m4 && automake -caf; libogg.cfg_params?= --enable-shared=no -- 2.29.0