From 8604cb0b8d37b387486b7b0a3c259581f2fcdc37 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <randrianasulu@gmail.com>
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