From cec4085238ee723b75095e94014e8595f374688b Mon Sep 17 00:00:00 2001 From: Kino Date: Tue, 25 Aug 2026 19:53:56 +0800 Subject: [PATCH] Bump aom to v3.14.1 (#15883) * Bump aom to v3.14.1 * Remove oboe dependency in vcpkg.json --- .github/workflows/ci.yml | 2 +- .github/workflows/flutter-build.yml | 4 ++-- .github/workflows/playground.yml | 2 +- build.rs | 1 - res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff | 13 +++++++++++++ res/vcpkg/aom/aom-uninitialized-pointer.diff | 6 +++--- res/vcpkg/aom/portfile.cmake | 11 +++++------ res/vcpkg/aom/vcpkg.json | 2 +- vcpkg.json | 6 +----- 9 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e8373cdc..ecc9ee782 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ env: # CICD_INTERMEDIATES_DIR: "_cicd-intermediates" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # for multiarch gcc compatibility - VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b" + VCPKG_COMMIT_ID: "9e593bb18ea69cc5095e012465dcd675a822ed0d" on: workflow_dispatch: diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 3a76412da..759677cca 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -36,13 +36,13 @@ env: FLUTTER_ELINUX_VERSION: "3.16.9" TAG_NAME: "${{ inputs.upload-tag }}" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - # vcpkg version: 2025.08.27 + # vcpkg version: 2026.07.29 # If we change the `VCPKG COMMIT_ID`, please remember: # 1. Call `$VCPKG_ROOT/vcpkg x-update-baseline` to update the baseline in `vcpkg.json`. # Or we may face build issue like # https://github.com/rustdesk/rustdesk/actions/runs/14414119794/job/40427970174 # 2. Update the `VCPKG_COMMIT_ID` in `ci.yml` and `playground.yml`. - VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b" + VCPKG_COMMIT_ID: "9e593bb18ea69cc5095e012465dcd675a822ed0d" ARMV7_VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836" # 2025.01.13, got "/opt/artifacts/vcpkg/vcpkg: No such file or directory" with latest version VERSION: "1.4.9" NDK_VERSION: "r28c" diff --git a/.github/workflows/playground.yml b/.github/workflows/playground.yml index 765bcf7f7..f8e408f76 100644 --- a/.github/workflows/playground.yml +++ b/.github/workflows/playground.yml @@ -16,7 +16,7 @@ env: FLUTTER_ELINUX_VERSION: "3.16.9" TAG_NAME: "nightly" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b" + VCPKG_COMMIT_ID: "9e593bb18ea69cc5095e012465dcd675a822ed0d" VERSION: "1.4.9" NDK_VERSION: "r26d" #signing keys env variable checks diff --git a/build.rs b/build.rs index 92fb1f4b4..ec87831c0 100644 --- a/build.rs +++ b/build.rs @@ -72,7 +72,6 @@ fn install_android_deps() { path.join("lib").to_str().unwrap() ); println!("cargo:rustc-link-lib=ndk_compat"); - println!("cargo:rustc-link-lib=oboe"); println!("cargo:rustc-link-lib=c++"); println!("cargo:rustc-link-lib=OpenSLES"); } diff --git a/res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff b/res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff new file mode 100644 index 000000000..37a7166cc --- /dev/null +++ b/res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff @@ -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() diff --git a/res/vcpkg/aom/aom-uninitialized-pointer.diff b/res/vcpkg/aom/aom-uninitialized-pointer.diff index 37a7166cc..0e8c12e21 100644 --- a/res/vcpkg/aom/aom-uninitialized-pointer.diff +++ b/res/vcpkg/aom/aom-uninitialized-pointer.diff @@ -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. diff --git a/res/vcpkg/aom/portfile.cmake b/res/vcpkg/aom/portfile.cmake index f7b1e3c43..502d31a7c 100644 --- a/res/vcpkg/aom/portfile.cmake +++ b/res/vcpkg/aom/portfile.cmake @@ -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 diff --git a/res/vcpkg/aom/vcpkg.json b/res/vcpkg/aom/vcpkg.json index 70a12d83e..8d69a88a3 100644 --- a/res/vcpkg/aom/vcpkg.json +++ b/res/vcpkg/aom/vcpkg.json @@ -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", diff --git a/vcpkg.json b/vcpkg.json index cd282fc1c..d1cd4044a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -25,10 +25,6 @@ "host": false, "platform": "windows & arm64" }, - { - "name": "oboe", - "platform": "android" - }, { "name": "opus", "host": true @@ -91,7 +87,7 @@ "vcpkg-configuration": { "default-registry": { "kind": "builtin", - "baseline": "120deac3062162151622ca4860575a33844ba10b" + "baseline": "9e593bb18ea69cc5095e012465dcd675a822ed0d" }, "overlay-ports": [ "./res/vcpkg"