From: Good Guy <good1.2guy@gmail.com>
Date: Fri, 22 Oct 2021 17:41:18 +0000 (-0600)
Subject: rename file and add Andrew 0002 HAVE_DV patch
X-Git-Tag: 2021-10~3
X-Git-Url: https://git.cinelerra-gg.org/?a=commitdiff_plain;h=0d719427668c3e1fd8982596317e3264a47aa6d9;p=goodguy%2Fcinelerra.git

rename file and add Andrew 0002 HAVE_DV patch
---

diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.1.0.patch1 b/cinelerra-5.1/thirdparty/src/libaom-v3.1.0.patch1
deleted file mode 100644
index 1c007dde..00000000
--- a/cinelerra-5.1/thirdparty/src/libaom-v3.1.0.patch1
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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.1.1.patch1 b/cinelerra-5.1/thirdparty/src/libaom-v3.1.1.patch1
new file mode 100644
index 00000000..1c007dde
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libaom-v3.1.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) {