[aom] update to v3.13.1 (#47533)

This commit is contained in:
Emilian R
2025-09-29 20:44:15 +03:00
committed by GitHub
parent 9da2a97077
commit 430bbf4bfd
8 changed files with 20 additions and 46 deletions

View File

@@ -1,36 +0,0 @@
diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake
index 2c263e9..fc9c2ca 100644
--- a/build/cmake/aom_install.cmake
+++ b/build/cmake/aom_install.cmake
@@ -91,8 +91,31 @@ macro(setup_aom_install_targets)
install(FILES "${AOM_PKG_CONFIG_FILE}"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
install(TARGETS ${AOM_INSTALL_LIBS};${AOM_INSTALL_BINS}
+ EXPORT unofficial-aom-targets
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ target_include_directories(aom PUBLIC $<INSTALL_INTERFACE:include>)
+ install(EXPORT unofficial-aom-targets
+ FILE unofficial-aom-targets.cmake
+ NAMESPACE unofficial::
+ DESTINATION share/aom)
+ include(CMakePackageConfigHelpers)
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake.in [[
+@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_dependency(Threads)
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-aom-targets.cmake")
+]])
+ configure_package_config_file(${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake
+ INSTALL_DESTINATION lib/cmake/aom
+ NO_SET_AND_CHECK_MACRO
+ NO_CHECK_REQUIRED_COMPONENTS_MACRO)
+ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/aom-config-version.cmake
+ VERSION ${SO_FILE_VERSION}
+ COMPATIBILITY SameMajorVersion)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/aom-config-version.cmake
+ DESTINATION share/aom)
endif()
endmacro()

View File

@@ -1,12 +1,11 @@
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL "https://aomedia.googlesource.com/aom"
REF d6f30ae474dd6c358f26de0a0fc26a0d7340a84c
REF d772e334cc724105040382a977ebb10dfd393293
HEAD_REF main
PATCHES
aom-rename-static.diff
aom-uninitialized-pointer.diff
export-config.diff
)
vcpkg_find_acquire_program(NASM)
@@ -38,7 +37,7 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/AOM)
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

View File

@@ -1,6 +1,6 @@
{
"name": "aom",
"version-semver": "3.11.0",
"version-semver": "3.13.1",
"description": "AV1 codec library",
"homepage": "https://aomedia.googlesource.com/aom",
"license": "BSD-2-Clause",

View File

@@ -21,9 +21,9 @@ index a28e6c3..aaeb5d2 100644
+ set(avif_static_link_libs yuv)
+ set(avif_find_dependencies "find_dependency(libyuv CONFIG)\n")
+ if(AVIF_CODEC_AOM_ENABLED)
+ find_package(aom CONFIG REQUIRED)
+ list(APPEND avif_static_link_libs unofficial::aom)
+ string(APPEND avif_find_dependencies "find_dependency(aom CONFIG)\n")
+ find_package(AOM CONFIG REQUIRED)
+ list(APPEND avif_static_link_libs AOM::aom)
+ string(APPEND avif_find_dependencies "find_dependency(AOM CONFIG)\n")
+ endif()
+ if(AVIF_CODEC_DAV1D_ENABLED)
+ list(APPEND avif_static_link_libs ${DAV1D_LIBRARIES} ${CMAKE_DL_LIBS})

View File

@@ -1,6 +1,7 @@
{
"name": "libavif",
"version-semver": "1.3.0",
"port-version": 1,
"description": "Library for encoding and decoding AVIF files",
"homepage": "https://github.com/AOMediaCodec/libavif",
"license": "BSD-2-Clause AND Apache-2.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "86c7b66df4a104a0d19e5208d9bc591d24f44d7c",
"version-semver": "3.13.1",
"port-version": 0
},
{
"git-tree": "b78024e1ea9566d0fcd0c1091558e0f1aac59fdd",
"version-semver": "3.11.0",

View File

@@ -161,7 +161,7 @@
"port-version": 2
},
"aom": {
"baseline": "3.11.0",
"baseline": "3.13.1",
"port-version": 0
},
"apache-datasketches": {
@@ -4570,7 +4570,7 @@
},
"libavif": {
"baseline": "1.3.0",
"port-version": 0
"port-version": 1
},
"libb2": {
"baseline": "0.98.1",

View File

@@ -1,7 +1,12 @@
{
"versions": [
{
"git-tree": "537563c8e4d49831113d936162a6be1c5f8f9f2f",
"git-tree": "d6a71c6784163a5c5b285a761033389723974387",
"version-semver": "1.3.0",
"port-version": 1
},
{
"git-tree": "b7a86219797184383b76c0efa3eeb54aaee060bd",
"version-semver": "1.3.0",
"port-version": 0
},