From: Good Guy <good1.2guy@gmail.com>
Date: Mon, 1 Nov 2021 16:20:07 +0000 (-0600)
Subject: update libaom via Andrew + 0006 patch LIBZMPEG
X-Git-Tag: 2021-11~14
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=279d3d4d92fa9c1831332633ce21345b29631fc2;p=goodguy%2Fcinelerra.git

update libaom via Andrew + 0006 patch LIBZMPEG
---

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index 88e36f63..dbcd6889 100644
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -174,10 +174,12 @@ int File::get_options(FormatTools *format,
 	format_completion->lock("File::get_options");
 	switch( asset->format ) {
 #ifdef HAVE_CIN_3RDPARTY
+#ifdef HAVE_LIBZMPEG
 	case FILE_AC3: FileAC3::get_parameters(parent_window, asset, format_window,
 			audio_options, video_options, edl);
 		break;
 #endif
+#endif
 #ifdef HAVE_DV
 	case FILE_RAWDV:
 		FileDV::get_parameters(parent_window, asset, format_window,
@@ -543,9 +545,11 @@ int File::open_file(Preferences *preferences,
 		break; }
 // format already determined
 #ifdef HAVE_CIN_3RDPARTY
+#ifdef HAVE_LIBZMPEG
 	case FILE_AC3:
 		file = new FileAC3(this->asset, this);
 		break;
+#endif
 #endif
 	case FILE_SCENE:
 		file = new FileScene(this->asset, this);
diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.2.0.patch0 b/cinelerra-5.1/thirdparty/src/libaom-v3.2.0.patch0
new file mode 100644
index 00000000..0c3ad19c
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libaom-v3.2.0.patch0
@@ -0,0 +1,11 @@
+--- libaom-3.1.1/CMakeLists.txt.orig	2021-09-07 21:36:23.156964673 +0300
++++ libaom-3.1.1/CMakeLists.txt	2021-09-07 21:36:53.780586982 +0300
+@@ -8,7 +8,7 @@
+ # License 1.0 was not distributed with this source code in the PATENTS file, you
+ # can obtain it at www.aomedia.org/license/patent.
+ #
+-cmake_minimum_required(VERSION 3.6)
++cmake_minimum_required(VERSION 3.5)
+ 
+ set(AOM_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
+ set(AOM_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.2.0.patch1 b/cinelerra-5.1/thirdparty/src/libaom-v3.2.0.patch1
new file mode 100644
index 00000000..1c007dde
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libaom-v3.2.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.2.0.tar.xz b/cinelerra-5.1/thirdparty/src/libaom-v3.2.0.tar.xz
new file mode 100644
index 00000000..3d085f31
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libaom-v3.2.0.tar.xz differ