TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-14 16:31:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bump aom to v3.14.1 (#15883)

Browse Source 
* Bump aom to v3.14.1

* Remove oboe dependency in vcpkg.json
This commit is contained in:
Kino
2026-08-25 19:53:56 +08:00
committed by GitHub
parent 0d917c6fa1
commit cec4085238
9 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index aaef2c310..5500ad4a3 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -309,6 +309,8 @@ if(MSVC)
# Disable MSVC warnings that suggest making code non-portable.
add_compiler_flag_if_supported("/wd4996")
+ # Disable MSVC warnings for potentially uninitialized local pointer variable.
+ add_compiler_flag_if_supported("/wd4703")
if(ENABLE_WERROR)
add_compiler_flag_if_supported("/WX")
endif()

6
res/vcpkg/aom/aom-uninitialized-pointer.diff
View File

@@ -1,7 +1,7 @@
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
diff --git a/cmake/aom_configure.cmake b/cmake/aom_configure.cmake
index aaef2c310..5500ad4a3 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
--- a/cmake/aom_configure.cmake
+++ b/cmake/aom_configure.cmake
@@ -309,6 +309,8 @@ if(MSVC)
# Disable MSVC warnings that suggest making code non-portable.

11
res/vcpkg/aom/portfile.cmake
View File

@@ -9,25 +9,24 @@ get_filename_component(PERL_PATH ${PERL} DIRECTORY)
vcpkg_add_to_path(${PERL_PATH})
if(DEFINED ENV{USE_AOM_391})
set(AOM_CONFIG_PATH "lib/cmake/aom")
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL "https://aomedia.googlesource.com/aom"
REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # 3.9.1
PATCHES
aom-uninitialized-pointer.diff
aom-uninitialized-pointer-3.9.1.diff
aom-avx2.diff
aom-install.diff
)
else()
set(AOM_CONFIG_PATH "lib/cmake/AOM")
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL "https://aomedia.googlesource.com/aom"
REF 10aece4157eb79315da205f39e19bf6ab3ee30d0 # 3.12.1
REF 03087864cf4bea6abb0d28f95cf7843511413d8f # 3.14.1
PATCHES
aom-uninitialized-pointer.diff
# aom-avx2.diff
# Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream
aom-install.diff
)
endif()
@@ -67,7 +66,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
# Move cmake configs
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
vcpkg_cmake_config_fixup(CONFIG_PATH ${AOM_CONFIG_PATH})
# Remove duplicate files
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include

2
res/vcpkg/aom/vcpkg.json
View File

@@ -1,6 +1,6 @@
{
"name": "aom",
"version-semver": "3.12.1",
"version-semver": "3.14.1",
"port-version": 0,
"description": "AV1 codec library",
"homepage": "https://aomedia.googlesource.com/aom",