+++ /dev/null
---- a/vpx_ports/mem.h 2019-12-09 16:09:20.000000000 -0700
-+++ b/vpx_ports/mem.h 2020-07-31 09:20:22.303406738 -0600
-@@ -15,7 +15,7 @@
- #include "vpx/vpx_integer.h"
-
- #if (defined(__GNUC__) && __GNUC__) || defined(__SUNPRO_C)
--#define DECLARE_ALIGNED(n, typ, val) typ val __attribute__((aligned(n)))
-+#define DECLARE_ALIGNED(n, typ, val) typ val __attribute__((aligned(64)))
- #elif defined(_MSC_VER)
- #define DECLARE_ALIGNED(n, typ, val) __declspec(align(n)) typ val
- #else
+++ /dev/null
-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"
+++ /dev/null
-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")
+++ /dev/null
---- ./CMakeLists.txt.orig 2021-11-23 13:07:40.473195486 +0300
-+++ ./CMakeLists.txt 2021-11-23 13:08:43.225195490 +0300
-@@ -4,15 +4,15 @@
-
- # Options for coder / decoder executables.
- option(WEBP_ENABLE_SIMD "Enable any SIMD optimization." ON)
--option(WEBP_BUILD_ANIM_UTILS "Build animation utilities." ON)
--option(WEBP_BUILD_CWEBP "Build the cwebp command line tool." ON)
--option(WEBP_BUILD_DWEBP "Build the dwebp command line tool." ON)
--option(WEBP_BUILD_GIF2WEBP "Build the gif2webp conversion tool." ON)
--option(WEBP_BUILD_IMG2WEBP "Build the img2webp animation tool." ON)
--option(WEBP_BUILD_VWEBP "Build the vwebp viewer tool." ON)
--option(WEBP_BUILD_WEBPINFO "Build the webpinfo command line tool." ON)
--option(WEBP_BUILD_WEBPMUX "Build the webpmux command line tool." ON)
--option(WEBP_BUILD_EXTRAS "Build extras." ON)
-+option(WEBP_BUILD_ANIM_UTILS "Build animation utilities." OFF)
-+option(WEBP_BUILD_CWEBP "Build the cwebp command line tool." OFF)
-+option(WEBP_BUILD_DWEBP "Build the dwebp command line tool." OFF)
-+option(WEBP_BUILD_GIF2WEBP "Build the gif2webp conversion tool." OFF)
-+option(WEBP_BUILD_IMG2WEBP "Build the img2webp animation tool." OFF)
-+option(WEBP_BUILD_VWEBP "Build the vwebp viewer tool." OFF)
-+option(WEBP_BUILD_WEBPINFO "Build the webpinfo command line tool." OFF)
-+option(WEBP_BUILD_WEBPMUX "Build the webpmux command line tool." OFF)
-+option(WEBP_BUILD_EXTRAS "Build extras." OFF)
- option(WEBP_BUILD_WEBP_JS "Emscripten build of webp.js." OFF)
- option(WEBP_NEAR_LOSSLESS "Enable near-lossless encoding" ON)
- option(WEBP_ENABLE_SWAP_16BIT_CSP "Enable byte swap for 16 bit colorspaces."
+++ /dev/null
---- ./Makefile.am
-+++ ./Makefile.am
-@@ -60,7 +60,7 @@
- rm -rf $(distdir)/_build/cmake
- rm -rf $(distdir)/_inst/cmake
-
--SUBDIRS = port libtiff tools build contrib test doc
-+SUBDIRS = port libtiff build
-
- release:
- (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
+++ /dev/null
---- ./configure.ac
-+++ ./configure.ac
-@@ -888,6 +888,7 @@
- if test "x$enable_webp" != "xno" ; then
-
- if test "x$with_webp_lib_dir" != "x" ; then
-+ LIBS="-lpthread $LIBS"
- LDFLAGS="-L$with_webp_lib_dir $LDFLAGS"
- fi
-