From: Good Guy <good1.2guy@gmail.com>
Date: Mon, 25 Jul 2022 20:09:54 +0000 (-0600)
Subject: remove old libaom
X-Git-Tag: 2022-07~3
X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=6fe3a7db96c23e9e21b5cc3ef853d6a6ff5cd19d

remove old libaom
---

diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.1.1.patch0 b/cinelerra-5.1/thirdparty/src/libaom-v3.1.1.patch0
deleted file mode 100644
index 0c3ad19c..00000000
--- a/cinelerra-5.1/thirdparty/src/libaom-v3.1.1.patch0
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.1.1.patch1 b/cinelerra-5.1/thirdparty/src/libaom-v3.1.1.patch1
deleted file mode 100644
index 1c007dde..00000000
--- a/cinelerra-5.1/thirdparty/src/libaom-v3.1.1.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.tar.xz b/cinelerra-5.1/thirdparty/src/libaom-v3.1.1.tar.xz
deleted file mode 100644
index d6460e06..00000000
Binary files a/cinelerra-5.1/thirdparty/src/libaom-v3.1.1.tar.xz and /dev/null differ