From 8a61833469f9f4fa290f66653b78a76225c61d64 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Thu, 26 Sep 2024 12:23:53 -0600 Subject: [PATCH] Credit Andrew - updated makeappimage tools for newer distros, correct esound linking, improve av1_svt render format --- cinelerra-5.1/cinelerra/Makefile | 3 +++ cinelerra-5.1/ffmpeg/video/av1_svt.webm | 10 +++++----- cinelerra-5.1/msg/txt | 3 +++ cinelerra-5.1/tools/makeappimagetool/appdir.cpp | 5 ++++- cinelerra-5.1/tools/makeappimagetool/core.cpp | 1 + 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index 1cb58d50..e8eb1d5b 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -464,6 +464,9 @@ LIBS += -lgif -ltheoraenc -ltheoradec -lvorbisfile -lvorbisenc -ltiff ifeq ($(shell uname -o), Android) LIBS += -landroid-shmem -liconv ../libbthread-master/jpt.a endif +ifeq ($(WANT_ESOUND),yes) +LIBS += -lesd +endif LIBS += $(shared_libs) LIBS += $(system_libs) else diff --git a/cinelerra-5.1/ffmpeg/video/av1_svt.webm b/cinelerra-5.1/ffmpeg/video/av1_svt.webm index 6784f822..717e1daf 100644 --- a/cinelerra-5.1/ffmpeg/video/av1_svt.webm +++ b/cinelerra-5.1/ffmpeg/video/av1_svt.webm @@ -1,6 +1,6 @@ webm libsvtav1 -# this codec codes less than one frame per sec -# and so even a few seconds of video can take -# a very long time to encode -# crf = 26 -# preset = 6 +# If you do not want 10 bit, switch pixel_format +# to yuv420p which is standard 8 bit. +crf = 35 +preset = 6 +pixel_format = yuv420p10le diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt index 6a1065f0..37da832a 100644 --- a/cinelerra-5.1/msg/txt +++ b/cinelerra-5.1/msg/txt @@ -3,6 +3,9 @@ For usage help, refer to the following: https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf http://g-raffa.eu/Cinelerra/HOWTO/basics.html . +2024 September changes of note: + Updated libraries include: dcraw, flac, giflib, + openjpeg, tiff, svt_av1, and x264 to current latest. 2024 July changes of note: All of the AppImages are now being built with x265 8/10/12 bit encode options (multibit). diff --git a/cinelerra-5.1/tools/makeappimagetool/appdir.cpp b/cinelerra-5.1/tools/makeappimagetool/appdir.cpp index a583eaf9..5c9b7532 100644 --- a/cinelerra-5.1/tools/makeappimagetool/appdir.cpp +++ b/cinelerra-5.1/tools/makeappimagetool/appdir.cpp @@ -160,8 +160,11 @@ namespace linuxdeploy { ldLog() << LD_DEBUG << "File exists, skipping:" << to << std::endl; return true; } - + #if BOOST_VERSION < 107400 bf::copy_file(from, to, bf::copy_option::overwrite_if_exists); + #else + bf::copy_file(from, to, bf::copy_options::overwrite_existing); + #endif bf::permissions(to, addedPerms | bf::add_perms); } catch (const bf::filesystem_error& e) { ldLog() << LD_ERROR << "Failed to copy file" << from << "to" << to << LD_NO_SPACE << ":" << e.what() << std::endl; diff --git a/cinelerra-5.1/tools/makeappimagetool/core.cpp b/cinelerra-5.1/tools/makeappimagetool/core.cpp index 07320389..3173e810 100644 --- a/cinelerra-5.1/tools/makeappimagetool/core.cpp +++ b/cinelerra-5.1/tools/makeappimagetool/core.cpp @@ -1,3 +1,4 @@ +#include #include #include -- 2.26.2