Update to libaom v3.13.2 (#3108)

Remove the workaround for issue
#3103.

Author: wantehchang

CHANGELOG.md

@@ -11,9 +11,9 @@ The changes are relative to the previous release, unless the baseline is specifi
 ### Changed since 1.4.0
 
 * Fix build with CMake 3.22
+* Update aom.cmd/LocalAom.cmake: v3.13.2
 * Update libxml2.cmd/LocalLibXml2.cmake: v2.15.2
 * Update libyuv.cmd/LocalLibyuv.cmake: 6067afde5 (1922)
-* Fix libaom v3.13.1 build with nasm
 * Support long path names in Windows
 
 ### Removed since 1.4.0

cmake/Modules/LocalAom.cmake

@@ -1,4 +1,4 @@
-set(AVIF_AOM_GIT_TAG v3.13.1)
+set(AVIF_AOM_GIT_TAG v3.13.2)
 
 set(AOM_EXT_SOURCE_DIR "${AVIF_SOURCE_DIR}/ext/aom")
 set(LIB_FILENAME "${AOM_EXT_SOURCE_DIR}/build.libavif/${CMAKE_STATIC_LIBRARY_PREFIX}aom${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -75,18 +75,6 @@ else()
         GIT_PROGRESS ON
         GIT_SHALLOW ON
         UPDATE_COMMAND ""
-        # Avoid the following error:
-        #   CMake Error at build/_deps/libaom-src/build/cmake/aom_optimization.cmake:219 (message):
-        #     Unsupported nasm: multipass optimization not supported.
-        #   Call Stack (most recent call first):
-        #     build/_deps/libaom-src/build/cmake/aom_configure.cmake:172 (test_nasm)
-        #     build/_deps/libaom-src/CMakeLists.txt:73 (include)
-        # TODO: Remove the patch when using a libaom version past
-        #       https://aomedia.googlesource.com/aom/+/6d2b7f71b98bfa28e372b1f2d85f137280bdb3de%5E%21/
-        # TODO: Switch back to URL "https://aomedia.googlesource.com/aom/+archive/${AVIF_AOM_GIT_TAG}.tar.gz"
-        #       instead of GIT_* above when using a libaom version past
-        #       https://aomedia.googlesource.com/aom/+/6d2b7f71b98bfa28e372b1f2d85f137280bdb3de%5E%21/
-        PATCH_COMMAND git apply ${AVIF_SOURCE_DIR}/cmake/Modules/LocalAom.diff
     )
 
     if(NOT AVIF_CODEC_AOM_DECODE)

cmake/Modules/LocalAom.diff

@@ -8,7 +8,7 @@
 : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir):
 : #     "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
 
-git clone -b v3.13.1 --depth 1 https://aomedia.googlesource.com/aom
+git clone -b v3.13.2 --depth 1 https://aomedia.googlesource.com/aom
 
 cmake -G Ninja -S aom -B aom/build.libavif -DBUILD_SHARED_LIBS=OFF -DCONFIG_PIC=1 -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0
 cmake --build aom/build.libavif --config Release --parallel