[vlc-commits] [Git][videolan/vlc][master] contrib: aom: update to 3.7.0

[Tristan Matthews (@tmatth)]

Tristan Matthews pushed to branch master at VideoLAN / VLC


Commits:
49eb51af by Tristan Matthews at 2023-09-14T16:59:35-04:00
contrib: aom: update to 3.7.0

This release includes new codec interfaces, compression efficiency and
perceptual improvements, speedup and memory optimizations and many bug fixes.
This release is ABI compatible with the last release.

See:
https://aomedia.googlesource.com/aom/+/refs/tags/v3.7.0

- - - - -


4 changed files:

- contrib/src/aom/0001-Use-the-pthread-library-found-by-CMake-in-the-pkg-co.patch
- + contrib/src/aom/0002-cmake-win-fix-asm-flag-appending.patch
- contrib/src/aom/SHA512SUMS
- contrib/src/aom/rules.mak


Changes:

=====================================
contrib/src/aom/0001-Use-the-pthread-library-found-by-CMake-in-the-pkg-co.patch
=====================================
@@ -1,6 +1,6 @@
-From 91bbb73a883de3df77504a5f6d0cd8c69850f286 Mon Sep 17 00:00:00 2001
+From 8c4905abedc2ae7ca507ff2933721ca29ec3a9eb Mon Sep 17 00:00:00 2001
 From: Steve Lhomme <robux4 at videolan.org>
-Date: Tue, 18 Jul 2023 09:47:19 +0200
+Date: Wed, 13 Sep 2023 11:19:02 -0400
 Subject: [PATCH] Use the pthread library found by CMake in the pkg-config file
 
 It may be empty on some platforms (Android)
@@ -18,10 +18,10 @@ Change-Id: I93a20ea4f7d0687bfa436de07eac7660c8f1e425
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake
-index 3b52a6872d..337ac2ddea 100644
+index b02c7b9..2c263e9 100644
 --- a/build/cmake/aom_install.cmake
 +++ b/build/cmake/aom_install.cmake
-@@ -46,11 +46,11 @@ macro(setup_aom_install_targets)
+@@ -46,12 +46,12 @@ macro(setup_aom_install_targets)
                -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
                -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
                -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}
@@ -29,13 +29,14 @@ index 3b52a6872d..337ac2ddea 100644
                -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}
                -DCONFIG_TUNE_VMAF=${CONFIG_TUNE_VMAF}
                -DCONFIG_TUNE_BUTTERAUGLI=${CONFIG_TUNE_BUTTERAUGLI}
+               -DCONFIG_SALIENCY_MAP=${CONFIG_SALIENCY_MAP}
                -DCONFIG_TFLITE=${CONFIG_TFLITE}
 -              -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H}
                -P
                "${AOM_ROOT}/build/cmake/pkg_config.cmake"
        COMMENT "Writing aom.pc"
 diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake
-index e8fff2e776..d3ba67b94b 100644
+index e8fff2e..d3ba67b 100644
 --- a/build/cmake/pkg_config.cmake
 +++ b/build/cmake/pkg_config.cmake
 @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.5)
@@ -59,5 +60,5 @@ index e8fff2e776..d3ba67b94b 100644
    file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
  endif()
 -- 
-2.37.3.windows.1
+2.39.2
 


=====================================
contrib/src/aom/0002-cmake-win-fix-asm-flag-appending.patch
=====================================
@@ -0,0 +1,29 @@
+From f7e163fe374bdc5cc6031aec10f678434b8b991d Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tmatth at videolan.org>
+Date: Wed, 13 Sep 2023 13:17:23 -0400
+Subject: [PATCH 1/1] cmake: win: fix asm flag appending
+
+These were evaluating to e.g.:
+aarch64-w64-mingw32-gcc;-c;-mimplicit-it=always
+
+which broke the detection of the actual asm executable's presence.
+---
+ build/cmake/aom_configure.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
+index aaef2c3..fe72e17 100644
+--- a/build/cmake/aom_configure.cmake
++++ b/build/cmake/aom_configure.cmake
+@@ -190,7 +190,7 @@ elseif(AOM_TARGET_CPU MATCHES "arm")
+     set(AOM_AS_FLAGS -arch ${AOM_TARGET_CPU} -isysroot ${CMAKE_OSX_SYSROOT})
+   elseif(AOM_TARGET_SYSTEM STREQUAL "Windows")
+     if(NOT CMAKE_ASM_COMPILER)
+-      set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} -c -mimplicit-it=always)
++      set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} "-c -mimplicit-it=always")
+     endif()
+   else()
+     if(NOT CMAKE_ASM_COMPILER)
+-- 
+2.39.2
+


=====================================
contrib/src/aom/SHA512SUMS
=====================================
@@ -1 +1 @@
-25afbc7911570973fa33410e9298eb31501b6f979fd4c60326081c9451c2cac8d692592d6fff19aac485da37da9c14e12ab4f95992e129ba7814b278b515d9bb  libaom-3.6.1.tar.gz
+b763a877db26dcaddea5513825900917e55bc131bf78a83f941f1e74b534a514cb599fb64c3ac18a8202ac0a72c511dfef6eeff21dfbe59ed9816887ca3ec5f3  libaom-3.7.0.tar.gz


=====================================
contrib/src/aom/rules.mak
=====================================
@@ -1,5 +1,5 @@
 # aom
-AOM_VERSION := 3.6.1
+AOM_VERSION := 3.7.0
 AOM_URL := https://storage.googleapis.com/aom-releases/libaom-$(AOM_VERSION).tar.gz
 
 PKGS += aom
@@ -15,6 +15,7 @@ $(TARBALLS)/libaom-$(AOM_VERSION).tar.gz:
 aom: libaom-$(AOM_VERSION).tar.gz .sum-aom
 	$(UNPACK)
 	$(APPLY) $(SRC)/aom/0001-Use-the-pthread-library-found-by-CMake-in-the-pkg-co.patch
+	$(APPLY) $(SRC)/aom/0002-cmake-win-fix-asm-flag-appending.patch
 	$(MOVE)
 
 DEPS_aom =



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/49eb51af0d3bedb5c45cb9dce1eaee211b892934

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/49eb51af0d3bedb5c45cb9dce1eaee211b892934
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance