From: Good Guy <good1.2guy@gmail.com>
Date: Sun, 31 Dec 2023 19:00:38 +0000 (-0700)
Subject: Credit Andrew - update libaom from 3.4 to 3.8 requiring cmake of 3.7.2 or higher... 
X-Git-Tag: 2024-01~7
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=e103158047a6707ab0f4ab8dd86da401b17efecc;p=goodguy%2Fcinelerra.git

Credit Andrew - update libaom from 3.4 to 3.8 requiring cmake of 3.7.2 or higher; modify Termux build for lv2 due to Python 3.12 deletion of imp
---

diff --git a/cinelerra-5.1/blds/termux.bld b/cinelerra-5.1/blds/termux.bld
index afa14a74..e30f5750 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"
-./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 1d74d031..bc0580e0 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}")
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
index 00000000..3d79cfcd
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libaom-v3.8.0.tar.xz differ