From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 21 Oct 2021 21:32:39 +0000 (-0600)
Subject: defaults for mxf format + android/termux patches from Andrew
X-Git-Tag: 2021-10~4
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=5616fa8528aa382cef440a88ffd0d87ed3bbfda2;p=goodguy%2Fcinelerra.git

defaults for mxf format + android/termux patches from Andrew
---

diff --git a/cinelerra-5.1/ffmpeg/audio/mxf.dfl b/cinelerra-5.1/ffmpeg/audio/mxf.dfl
new file mode 100644
index 00000000..02ebb126
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/mxf.dfl
@@ -0,0 +1 @@
+mxf_pcm24.mxf
diff --git a/cinelerra-5.1/ffmpeg/video/mxf.dfl b/cinelerra-5.1/ffmpeg/video/mxf.dfl
new file mode 100644
index 00000000..3b8d8cb9
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/mxf.dfl
@@ -0,0 +1 @@
+mxf_DNxHR_proxy.mxf
diff --git a/cinelerra-5.1/thirdparty/src/libaom-v3.1.0.patch1 b/cinelerra-5.1/thirdparty/src/libaom-v3.1.0.patch1
new file mode 100644
index 00000000..1c007dde
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libaom-v3.1.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/libwebp-1.1.0.patch1 b/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch1
new file mode 100644
index 00000000..9e3d2b04
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch1
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9503daa..61c15e6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,20 +75,6 @@ set(INSTALLED_LIBRARIES)
+ 
+ # ##############################################################################
+ # Android only.
+-if(ANDROID)
+-  include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
+-  add_library(cpufeatures STATIC
+-              ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
+-  list(APPEND INSTALLED_LIBRARIES cpufeatures)
+-  target_link_libraries(cpufeatures dl)
+-  set(WEBP_DEP_LIBRARIES ${WEBP_DEP_LIBRARIES} cpufeatures)
+-  set(WEBP_DEP_INCLUDE_DIRS ${WEBP_DEP_INCLUDE_DIRS}
+-      ${ANDROID_NDK}/sources/android/cpufeatures)
+-  add_definitions(-DHAVE_CPU_FEATURES_H=1)
+-  set(HAVE_CPU_FEATURES_H 1)
+-else()
+-  set(HAVE_CPU_FEATURES_H 0)
+-endif()
+ 
+ function(configure_pkg_config FILE)
+   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.in"
diff --git a/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch2 b/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch2
new file mode 100644
index 00000000..737e1efa
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch2
@@ -0,0 +1,20 @@
+diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake
+index da9a42a..46a8f4a 100644
+--- a/cmake/cpu.cmake
++++ b/cmake/cpu.cmake
+@@ -46,14 +46,7 @@ set(WEBP_SIMD_FILES_TO_NOT_INCLUDE)
+ set(WEBP_SIMD_FILES_TO_INCLUDE)
+ set(WEBP_SIMD_FLAGS_TO_INCLUDE)
+ 
+-if(${ANDROID})
+-  if(${ANDROID_ABI} STREQUAL "armeabi-v7a")
+-    # This is because Android studio uses the configuration "-march=armv7-a
+-    # -mfloat-abi=softfp -mfpu=vfpv3-d16" that does not trigger neon
+-    # optimizations but should (as this configuration does not exist anymore).
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon ")
+-  endif()
+-endif()
++
+ 
+ list(LENGTH WEBP_SIMD_FLAGS WEBP_SIMD_FLAGS_LENGTH)
+ math(EXPR WEBP_SIMD_FLAGS_RANGE "${WEBP_SIMD_FLAGS_LENGTH} - 1")