So I played around lcms2 2.13.1 integration in cingg build system for ffmpeg and it appear to work - at least build works and I can see iccgen/iccdetect filters ...
Note, lcms2 tarball not included due to size Note that ffmpeg also demand lcms2 >= 2.13 We also can try and get in ffmpeg.git patches hopefully enabling automatic icc profile support at least for input images ...
From 3079be93c730c2e1c7eadd233cb12bfe7df8222c Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Tue, 23 Aug 2022 02:09:35 +0300 Subject: [PATCH 5/6] add lcms2 2.13.1 for ffmpeg 5.1 --- cinelerra-5.1/configure.ac | 6 ++++++ cinelerra-5.1/thirdparty/Makefile | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index ab06ace9..06c0531d 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -494,6 +494,11 @@ PKG_3RD([libbthread],[auto], [ . ]) fi +PKG_3RD([lcms2],[auto], + [lcms2-2.13.1], + [ src/.libs/liblcms2.a ], + [ include ]) + AC_SUBST(STATIC_PKGS) @@ -1042,6 +1047,7 @@ PKG_PROVIDE([sord], [$WANT_LV2]) PKG_PROVIDE([suil], [$WANT_LV2]) PKG_PROVIDE([ffnvcodec], [$WANT_NV]) PKG_PROVIDE([libdpx]) +PKG_PROVIDE([lcms2]) if test "x$WANT_LV2" = "xyes"; then if test "x$HAVE_lv2" = "xyes" -a "x$BUILD_lilv" = "x0"; then diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 504acb4a..ab08d7d6 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -130,7 +130,9 @@ esound.mak_vars+= CFLAGS="" esound.ldflags=" -lm -lstdc++" fftw.cfg_params= --disable-fortran --enable-shared=no ffmpeg.cfg_params= \ - --enable-pthreads --disable-avdevice --enable-gpl --disable-ffplay \ + --enable-pthreads --disable-avdevice --enable-gpl \ + --disable-ffplay \ + $(call if_ena,lcms2,--enable-lcms2,--disable-lcms2) \ $(call if_want,VAAPI,--enable-vaapi,--disable-vaapi) \ $(call if_want,VDPAU,--enable-vdpau,--disable-vdpau) \ $(call if_want,NV, --enable-nvenc --enable-nvdec --enable-ffnvcodec) \ @@ -177,6 +179,7 @@ ffmpeg.cfg_params= \ $(call ld_path,libvpx) \ $(call ld_path,x264) \ $(call ld_path,x265) \ + $(call ld_path,lcms2) \ $(shared_libs) \ -Wl,--end-group -lm -lstdc++ -pthread \ $(EXTRA_LIBS)" $(FFMPEG_EXTRA_CFG) \ @@ -264,6 +267,8 @@ x265.cfg_params?= -DENABLE_SHARED=no libvpx.cfg_params?= --enable-pic --disable-avx512 --enable-vp9-highbitdepth --disable-examples --disable-unit_tests libdpx.cfg_vars?= libtoolize; aclocal; autoconf; automake -a; +lcms2.cfg_params?= --disable-shared + DS:=$$$$$$$$ pkg_cfg=$(call bld_path,$(1),usr/local/lib/pkgconfig): LV2_PKGCFG:=$(subst : ,:,$(foreach p,lv2 serd sord sratom lilv suil,$(call pkg_cfg,$(p)))) @@ -335,7 +340,7 @@ $(call rules,$(call std-build,djbfft)) $(call rules,$(call std-build,audiofile)) $(call rules,$(call std-build,encore)) $(call rules,$(call std-build,esound,audiofile)) -$(call rules,$(call std-build,ffmpeg, twolame lame openjpeg opus \ +$(call rules,$(call std-build,ffmpeg, lcms2, twolame lame openjpeg opus \ libtheora x264 x265 libvpx libaom dav1d libwebp \ $(call if_want,NV, ffnvcodec))) $(call rules,$(call std-build,fftw)) @@ -377,6 +382,8 @@ $(call rules,$(call std-build,lilv, lv2 sratom serd sord)) $(call rules,$(call std-build,suil, lv2)) $(call rules,$(call std-build,ffnvcodec)) $(call rules,$(call std-build,libdpx)) +$(call rules,$(call std-build,lcms2)) + # specialize festival, multiple tarballs festival: -- 2.37.1
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
