Credit Andrew - update libaom from 3.4 to 3.8 requiring cmake of 3.7.2 or higher...

diff --git a/cinelerra-5.1/blds/termux.bld b/cinelerra-5.1/blds/termux.bld
index afa14a74c13f38920007864c91ab643ee2f94f3d..e30f5750b95c2f0d1c597e0db813a0ac3f769108 100755 (executable)
--- 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"
-./configure --without-lv2 --without-vdpau --without-vaapi --without-ladspa-build \
- --without-nv  --with-single-user --with-clang --without-gl --disable-dav1d
+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 -landroid-posix-semaphore"
+./configure --with-lv2 --disable-lv2 --disable-sord --disable-serd --disable-suil --disable-sratom --disable-lilv --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 1d74d031735d379899acf386391e690a31e62721..bc0580e0f890cedbdd4e125a224f154926bd60c6 100644 (file)
--- 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 (file)
index 0000000..fcd437e
--- /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}")

diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.8.0.tar.xz b/cinelerra-5.1/thirdparty/src/libaom-v3.8.0.tar.xz
new file mode 100644 (file)
index 0000000..3d79cfc
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libaom-v3.8.0.tar.xz differ