https://cloud.mail.ru/public/KAkQ/AwCYiaiuF
in case you like to run resulting cingg distribution on Ubuntu 16 / cmake 3.5.1 (only x86_64 qemu vm tested) I dunno, because I seems to be only one termux user than may be patch 0001 can go in as it shouldn't affect normal or even termux dynamic compilation? Other patches go in order. I hope you get x265 update from earlier folder, so not repeated here. Put new (old) libaom tar.xz in thirdparty/src, make sure you do not have libaom-v3.8.0.tar.xz there, try to build and render small av1 file.
From d2e587b547a33a300f248529699354a0b4983357 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Wed, 1 Mar 2023 23:26:45 +0300 Subject: [PATCH 01/12] EXPERIMENTAL: enable opencl on termux, also libmediacodec --- cinelerra-5.1/blds/termux.bld | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/blds/termux.bld b/cinelerra-5.1/blds/termux.bld index afa14a74..cf131545 100755 --- a/cinelerra-5.1/blds/termux.bld +++ b/cinelerra-5.1/blds/termux.bld @@ -1,6 +1,6 @@ #!/bin/bash # Produced, tested, and used by Andrew-R on an Android tablet -export FFMPEG_EXTRA_CFG="--disable-debug --disable-doc --disable-ffprobe --enable-libdav1d" -export EXTRA_LIBS="-ldav1d" +export FFMPEG_EXTRA_CFG="--disable-debug --target-os=android --enable-mediacodec --enable-jni --enable-opencl --disable-doc --disable-ffprobe --enable-libdav1d" +export EXTRA_LIBS="-ldav1d -lOpenCL -landroid" ./configure --without-lv2 --without-vdpau --without-vaapi --without-ladspa-build \ --without-nv --with-single-user --with-clang --without-gl --disable-dav1d -- 2.43.0
From 8604cb0b8d37b387486b7b0a3c259581f2fcdc37 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 17 Dec 2023 23:45:59 +0300 Subject: [PATCH 12/12] Add libaom 3.6.1 patches --- .../thirdparty/src/libaom-v3.6.1.patch0 | 11 ++++++++++ .../thirdparty/src/libaom-v3.6.1.patch1 | 21 ++++++++++++++++++ .../thirdparty/src/libaom-v3.6.1.patch2 | 22 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch0 create mode 100644 cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch1 create mode 100644 cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch2 diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch0 b/cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch0 new file mode 100644 index 00000000..8fc94ee5 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch0 @@ -0,0 +1,11 @@ +--- libaom-v3.4.0/CMakeLists.txt.orig 2022-07-23 22:33:18.090606192 +0300 ++++ libaom-v3.4.0/CMakeLists.txt 2022-07-23 22:41:42.114605831 +0300 +@@ -11,7 +11,7 @@ + if(CONFIG_TFLITE) + cmake_minimum_required(VERSION 3.11) + else() +- cmake_minimum_required(VERSION 3.7) ++ cmake_minimum_required(VERSION 3.5) + endif() + + set(AOM_ROOT "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch1 b/cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch1 new file mode 100644 index 00000000..411cf4c7 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch1 @@ -0,0 +1,21 @@ +--- libaom-v3.0.0/aom_ports/arm_cpudetect.c 2020-07-10 02:32:42.000000000 +0300 ++++ libaom-v3.0.0_1/aom_ports/arm_cpudetect.c 2021-05-08 05:18:23.404156362 +0300 +@@ -87,7 +87,7 @@ + return flags & mask; + } + +-#elif defined(__ANDROID__) /* end _MSC_VER */ ++#elif (defined(__ANDROID__) && !defined(__TERMUX__))/* end _MSC_VER */ + #include <cpu-features.h> + + int aom_arm_cpu_caps(void) { +@@ -106,8 +106,7 @@ + return flags & mask; + } + +-#elif defined(__linux__) /* end __ANDROID__ */ +- ++#elif defined(__linux__) || defined(__TERMUX__)/* end __ANDROID__ */ + #include <stdio.h> + + int aom_arm_cpu_caps(void) { diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch2 b/cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch2 new file mode 100644 index 00000000..1f525ff8 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/libaom-v3.6.1.patch2 @@ -0,0 +1,22 @@ +--- a/build/cmake/aom_configure.cmake.orig 2023-12-17 17:30:35.859425483 +0300 ++++ b/build/cmake/aom_configure.cmake 2023-12-17 17:31:24.027041143 +0300 +@@ -328,13 +328,13 @@ + # with this flag. Note the order of this check and -Wextra-semi-stmt is + # important due to is_flag_present() matching substrings with string(FIND + # ...). +- if(CMAKE_VERSION VERSION_LESS "3.19" +- AND CMAKE_C_COMPILER_ID STREQUAL "GNU" +- AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10) +- add_cxx_flag_if_supported("-Wextra-semi") +- else() ++# if(CMAKE_VERSION VERSION_LESS "3.19" ++# AND CMAKE_C_COMPILER_ID STREQUAL "GNU" ++# AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10) ++# add_cxx_flag_if_supported("-Wextra-semi") ++# else() + add_compiler_flag_if_supported("-Wextra-semi") +- endif() ++# endif() + add_compiler_flag_if_supported("-Wextra-semi-stmt") + add_compiler_flag_if_supported("-Wfloat-conversion") + add_compiler_flag_if_supported("-Wformat=2") -- 2.43.0
From 91f7f1f941dc4a79e26fc4538ccab4718f5a008e Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 17 Dec 2023 08:05:31 +0300 Subject: [PATCH 10/12] Update x265 to git snapshot 17122023 --- cinelerra-5.1/blds/termux.bld | 2 +- cinelerra-5.1/configure.ac | 2 +- cinelerra-5.1/thirdparty/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinelerra-5.1/blds/termux.bld b/cinelerra-5.1/blds/termux.bld index cf131545..a7a6e988 100755 --- a/cinelerra-5.1/blds/termux.bld +++ b/cinelerra-5.1/blds/termux.bld @@ -1,6 +1,6 @@ #!/bin/bash # Produced, tested, and used by Andrew-R on an Android tablet export FFMPEG_EXTRA_CFG="--disable-debug --target-os=android --enable-mediacodec --enable-jni --enable-opencl --disable-doc --disable-ffprobe --enable-libdav1d" -export EXTRA_LIBS="-ldav1d -lOpenCL -landroid" +export EXTRA_LIBS="-ldav1d -lOpenCL -landroid -landroid-posix-semaphore" ./configure --without-lv2 --without-vdpau --without-vaapi --without-ladspa-build \ --without-nv --with-single-user --with-clang --without-gl --disable-dav1d diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index b2b11014..ff8164e7 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -423,7 +423,7 @@ PKG_3RD([x264],[auto], [ . ]) PKG_3RD([x265],[auto], - [x265_3.5], + [x265-17122023], [ libx265.a ], [ . source ]) diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 8c7aaf91..3a7b603e 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -266,7 +266,7 @@ tiff.cfg_params+= --disable-libdeflate --disable-lerc --enable-shared=no --disab 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 +x265.cfg_params?= -DENABLE_SHARED=no -DENABLE_CLI=no libvpx.cfg_params?= --enable-pic --disable-avx512 --enable-vp9-highbitdepth --disable-examples --disable-unit_tests libdpx.cfg_vars?= libtoolize; aclocal; autoconf; automake -a; -- 2.43.0
From 1ec0e4ca8c7f54a2172ef9975bee047cd62db0ba Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 17 Dec 2023 23:44:50 +0300 Subject: [PATCH 11/12] Move libaom back to 3.6.1 for ubuntu 16 (cmake 3.5) --- cinelerra-5.1/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index ff8164e7..6e394eb4 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -463,7 +463,7 @@ PKG_3RD([suil],[auto], [ usr/local/include ]) PKG_3RD([libaom],[auto], - [libaom-v3.8.0], + [libaom-v3.6.1], [ usr/local/lib*/libaom*.a ], [ usr/local/include ]) -- 2.43.0
From 63feb438c65d2b5605001569001f2a0b26e546ff Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 17 Dec 2023 06:54:05 +0300 Subject: [PATCH 09/12] Update libaom to 3.8.0 --- cinelerra-5.1/configure.ac | 2 +- cinelerra-5.1/thirdparty/src/libaom-v3.8.0.patch0 | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 cinelerra-5.1/thirdparty/src/libaom-v3.8.0.patch0 diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index f210281c..b2b11014 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -463,7 +463,7 @@ PKG_3RD([suil],[auto], [ usr/local/include ]) PKG_3RD([libaom],[auto], - [libaom-v3.4.0], + [libaom-v3.8.0], [ usr/local/lib*/libaom*.a ], [ usr/local/include ]) diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.8.0.patch0 b/cinelerra-5.1/thirdparty/src/libaom-v3.8.0.patch0 new file mode 100644 index 00000000..fcd437ef --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/libaom-v3.8.0.patch0 @@ -0,0 +1,11 @@ +--- libaom-v3.4.0/CMakeLists.txt.orig 2022-07-23 22:33:18.090606192 +0300 ++++ libaom-v3.4.0/CMakeLists.txt 2022-07-23 22:41:42.114605831 +0300 +@@ -11,7 +11,7 @@ + if(CONFIG_TFLITE) + cmake_minimum_required(VERSION 3.11) + else() +- cmake_minimum_required(VERSION 3.9) ++ cmake_minimum_required(VERSION 3.5) + endif() + + set(AOM_ROOT "${CMAKE_CURRENT_SOURCE_DIR}") -- 2.43.0
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
