Credit libaom/libvpx teams and Andrew patch update

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index bce24689930f2401a8a800285b49e50a1a2f8ee5..83d2465ec716f01609c5f963dca62045c4007c76 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -422,7 +422,7 @@ PKG_3RD([x265],[auto],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],
-  [libvpx-1.11.0],
+  [libvpx-1.12.0],
   [ libvpx.a ],
   [ . ])
 
@@ -457,7 +457,7 @@ PKG_3RD([suil],[auto],
   [ usr/local/include ])
 
 PKG_3RD([libaom],[auto],
-  [libaom-v3.2.0],
+  [libaom-v3.4.0],
   [ usr/local/lib*/libaom*.a ],
   [ usr/local/include ])
 

diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index 3a3a86ddd008fabd861ededae6d2802bd9945bb6..fcc766ebab7d56251030dce259da7fe43f7a71ea 100644 (file)
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -36,12 +36,12 @@ https://code.videolan.org/videolan/x264/-/tree/stable/x264-stable.tar.gz
 https://code.videolan.org/videolan/x264/-/tree/master/x264-snapshot-20210615-master.tar.xz (Andrew does somehow)
 https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
 https://ffmpeg.org/releases/ffmpeg-4.4.tar.bz2
-https://github.com/webmproject/libvpx/archive/v1.11.0.tar.gz
+https://github.com/webmproject/libvpx/archive/v1.12.0.tar.gz
 https://code.videolan.org/videolan/dav1d/-/archive/0.7.1/dav1d-0.7.1.tar.gz
 https://github.com/swh/ladspa/releases/tag/v0.4.17, plugin.org.uk
 https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
 https://github.com/webmproject/libwebp = libwebp-1.1.0
-https://github.com/mozilla/aom = libaom-v3.1.1
+https://github.com/mozilla/aom = libaom-v3.4.0
 git clone https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ??
 https://github.com/FFmpeg/nv-codec-headers/releases/download/n10.0.26.0/nv-codec-headers-10.0.26.0.tar.gz
 

diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.4.0.patch0 b/cinelerra-5.1/thirdparty/src/libaom-v3.4.0.patch0
new file mode 100644 (file)
index 0000000..8fc94ee
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libaom-v3.4.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.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.4.0.patch1 b/cinelerra-5.1/thirdparty/src/libaom-v3.4.0.patch1
new file mode 100644 (file)
index 0000000..411cf4c
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libaom-v3.4.0.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.4.0.tar.xz b/cinelerra-5.1/thirdparty/src/libaom-v3.4.0.tar.xz
new file mode 100644 (file)
index 0000000..f55e51d
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libaom-v3.4.0.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.12.0.patch1 b/cinelerra-5.1/thirdparty/src/libvpx-1.12.0.patch1
new file mode 100644 (file)
index 0000000..3700951
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libvpx-1.12.0.patch1
@@ -0,0 +1,11 @@
+--- a/vpx_ports/mem.h  2019-12-09 16:09:20.000000000 -0700
++++ b/vpx_ports/mem.h  2020-07-31 09:20:22.303406738 -0600
+@@ -15,7 +15,7 @@
+ #include "vpx/vpx_integer.h"
+ 
+ #if (defined(__GNUC__) && __GNUC__) || defined(__SUNPRO_C)
+-#define DECLARE_ALIGNED(n, typ, val) typ val __attribute__((aligned(n)))
++#define DECLARE_ALIGNED(n, typ, val) typ val __attribute__((aligned(64)))
+ #elif defined(_MSC_VER)
+ #define DECLARE_ALIGNED(n, typ, val) __declspec(align(n)) typ val
+ #else

diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.12.0.tar.xz b/cinelerra-5.1/thirdparty/src/libvpx-1.12.0.tar.xz
new file mode 100644 (file)
index 0000000..7e641d9
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libvpx-1.12.0.tar.xz differ