From 9c5e262df5b6cbe0f4e4b2d53e68e8edc487494b Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 15 Aug 2021 16:02:12 -0600 Subject: [PATCH] minor improvements from Andrew --- cinelerra-5.1/cinelerra/formatpopup.C | 5 ++++- cinelerra-5.1/thirdparty/Makefile | 2 +- cinelerra-5.1/thirdparty/compile_multibit_X265.txt | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cinelerra-5.1/cinelerra/formatpopup.C b/cinelerra-5.1/cinelerra/formatpopup.C index addd4a2c..dc1e9515 100644 --- a/cinelerra-5.1/cinelerra/formatpopup.C +++ b/cinelerra-5.1/cinelerra/formatpopup.C @@ -92,7 +92,10 @@ void FormatPopup::create_objects() if(!use_brender) post_item(FILE_TIFF); post_item(FILE_TIFF_LIST); - +#ifdef HAVE_OPENEXR + if(use_brender) + post_item(FILE_EXR_LIST); +#endif update(&format_items, 0, 0, 1); } diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 73d3d1b7..7f995e16 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -252,7 +252,7 @@ twolame.cfg_params?=--enable-shared=no x264.cfg_params?= --enable-static --enable-pic x265.cfg_vars?=$(call cmake_config,source) x265.cfg_params?= -DENABLE_SHARED=no -libvpx.cfg_params?= --enable-pic --disable-avx512 +libvpx.cfg_params?= --enable-pic --disable-avx512 --disable-examples --disable-unit_tests DS:=$$$$$$$$ pkg_cfg=$(call bld_path,$(1),usr/local/lib/pkgconfig): diff --git a/cinelerra-5.1/thirdparty/compile_multibit_X265.txt b/cinelerra-5.1/thirdparty/compile_multibit_X265.txt index 6a14f166..a96f3396 100644 --- a/cinelerra-5.1/thirdparty/compile_multibit_X265.txt +++ b/cinelerra-5.1/thirdparty/compile_multibit_X265.txt @@ -25,8 +25,8 @@ diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefi +x265.cfg_vars?=chmod +x ./configure; chmod +x ./multilib.sh; +#x265.cfg_vars?=$(call cmake_config,source) +#x265.cfg_params?= -DENABLE_SHARED=no - libvpx.cfg_params?= --enable-pic --disable-avx512 - + libvpx.cfg_params?= --enable-pic --disable-avx512 --disable-examples --disable-unit_tests + DS:=$$$$$$$$ diff --git a/cinelerra-5.1/thirdparty/src/x265_3.5.patch1 b/cinelerra-5.1/thirdparty/src/x265_3.5.patch1 new file mode 100644 -- 2.26.2