mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-09-15 00:41:01 +03:00
Bump aom to v3.14.1 (#15883)
* Bump aom to v3.14.1 * Remove oboe dependency in vcpkg.json
This commit is contained in:
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -5,7 +5,7 @@ env:
|
|||||||
# CICD_INTERMEDIATES_DIR: "_cicd-intermediates"
|
# CICD_INTERMEDIATES_DIR: "_cicd-intermediates"
|
||||||
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
|
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
|
||||||
# for multiarch gcc compatibility
|
# for multiarch gcc compatibility
|
||||||
VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b"
|
VCPKG_COMMIT_ID: "9e593bb18ea69cc5095e012465dcd675a822ed0d"
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|||||||
4
.github/workflows/flutter-build.yml
vendored
4
.github/workflows/flutter-build.yml
vendored
@@ -36,13 +36,13 @@ env:
|
|||||||
FLUTTER_ELINUX_VERSION: "3.16.9"
|
FLUTTER_ELINUX_VERSION: "3.16.9"
|
||||||
TAG_NAME: "${{ inputs.upload-tag }}"
|
TAG_NAME: "${{ inputs.upload-tag }}"
|
||||||
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
|
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:
|
# If we change the `VCPKG COMMIT_ID`, please remember:
|
||||||
# 1. Call `$VCPKG_ROOT/vcpkg x-update-baseline` to update the baseline in `vcpkg.json`.
|
# 1. Call `$VCPKG_ROOT/vcpkg x-update-baseline` to update the baseline in `vcpkg.json`.
|
||||||
# Or we may face build issue like
|
# Or we may face build issue like
|
||||||
# https://github.com/rustdesk/rustdesk/actions/runs/14414119794/job/40427970174
|
# https://github.com/rustdesk/rustdesk/actions/runs/14414119794/job/40427970174
|
||||||
# 2. Update the `VCPKG_COMMIT_ID` in `ci.yml` and `playground.yml`.
|
# 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
|
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"
|
VERSION: "1.4.9"
|
||||||
NDK_VERSION: "r28c"
|
NDK_VERSION: "r28c"
|
||||||
|
|||||||
2
.github/workflows/playground.yml
vendored
2
.github/workflows/playground.yml
vendored
@@ -16,7 +16,7 @@ env:
|
|||||||
FLUTTER_ELINUX_VERSION: "3.16.9"
|
FLUTTER_ELINUX_VERSION: "3.16.9"
|
||||||
TAG_NAME: "nightly"
|
TAG_NAME: "nightly"
|
||||||
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
|
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
|
||||||
VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b"
|
VCPKG_COMMIT_ID: "9e593bb18ea69cc5095e012465dcd675a822ed0d"
|
||||||
VERSION: "1.4.9"
|
VERSION: "1.4.9"
|
||||||
NDK_VERSION: "r26d"
|
NDK_VERSION: "r26d"
|
||||||
#signing keys env variable checks
|
#signing keys env variable checks
|
||||||
|
|||||||
1
build.rs
1
build.rs
@@ -72,7 +72,6 @@ fn install_android_deps() {
|
|||||||
path.join("lib").to_str().unwrap()
|
path.join("lib").to_str().unwrap()
|
||||||
);
|
);
|
||||||
println!("cargo:rustc-link-lib=ndk_compat");
|
println!("cargo:rustc-link-lib=ndk_compat");
|
||||||
println!("cargo:rustc-link-lib=oboe");
|
|
||||||
println!("cargo:rustc-link-lib=c++");
|
println!("cargo:rustc-link-lib=c++");
|
||||||
println!("cargo:rustc-link-lib=OpenSLES");
|
println!("cargo:rustc-link-lib=OpenSLES");
|
||||||
}
|
}
|
||||||
|
|||||||
13
res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff
Normal file
13
res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff
Normal 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()
|
||||||
@@ -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
|
index aaef2c310..5500ad4a3 100644
|
||||||
--- a/build/cmake/aom_configure.cmake
|
--- a/cmake/aom_configure.cmake
|
||||||
+++ b/build/cmake/aom_configure.cmake
|
+++ b/cmake/aom_configure.cmake
|
||||||
@@ -309,6 +309,8 @@ if(MSVC)
|
@@ -309,6 +309,8 @@ if(MSVC)
|
||||||
|
|
||||||
# Disable MSVC warnings that suggest making code non-portable.
|
# Disable MSVC warnings that suggest making code non-portable.
|
||||||
|
|||||||
@@ -9,25 +9,24 @@ get_filename_component(PERL_PATH ${PERL} DIRECTORY)
|
|||||||
vcpkg_add_to_path(${PERL_PATH})
|
vcpkg_add_to_path(${PERL_PATH})
|
||||||
|
|
||||||
if(DEFINED ENV{USE_AOM_391})
|
if(DEFINED ENV{USE_AOM_391})
|
||||||
|
set(AOM_CONFIG_PATH "lib/cmake/aom")
|
||||||
vcpkg_from_git(
|
vcpkg_from_git(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
URL "https://aomedia.googlesource.com/aom"
|
URL "https://aomedia.googlesource.com/aom"
|
||||||
REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # 3.9.1
|
REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # 3.9.1
|
||||||
PATCHES
|
PATCHES
|
||||||
aom-uninitialized-pointer.diff
|
aom-uninitialized-pointer-3.9.1.diff
|
||||||
aom-avx2.diff
|
aom-avx2.diff
|
||||||
aom-install.diff
|
aom-install.diff
|
||||||
)
|
)
|
||||||
else()
|
else()
|
||||||
|
set(AOM_CONFIG_PATH "lib/cmake/AOM")
|
||||||
vcpkg_from_git(
|
vcpkg_from_git(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
URL "https://aomedia.googlesource.com/aom"
|
URL "https://aomedia.googlesource.com/aom"
|
||||||
REF 10aece4157eb79315da205f39e19bf6ab3ee30d0 # 3.12.1
|
REF 03087864cf4bea6abb0d28f95cf7843511413d8f # 3.14.1
|
||||||
PATCHES
|
PATCHES
|
||||||
aom-uninitialized-pointer.diff
|
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()
|
endif()
|
||||||
|
|
||||||
@@ -67,7 +66,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Move cmake configs
|
# Move cmake configs
|
||||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
|
vcpkg_cmake_config_fixup(CONFIG_PATH ${AOM_CONFIG_PATH})
|
||||||
|
|
||||||
# Remove duplicate files
|
# Remove duplicate files
|
||||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "aom",
|
"name": "aom",
|
||||||
"version-semver": "3.12.1",
|
"version-semver": "3.14.1",
|
||||||
"port-version": 0,
|
"port-version": 0,
|
||||||
"description": "AV1 codec library",
|
"description": "AV1 codec library",
|
||||||
"homepage": "https://aomedia.googlesource.com/aom",
|
"homepage": "https://aomedia.googlesource.com/aom",
|
||||||
|
|||||||
@@ -25,10 +25,6 @@
|
|||||||
"host": false,
|
"host": false,
|
||||||
"platform": "windows & arm64"
|
"platform": "windows & arm64"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "oboe",
|
|
||||||
"platform": "android"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "opus",
|
"name": "opus",
|
||||||
"host": true
|
"host": true
|
||||||
@@ -91,7 +87,7 @@
|
|||||||
"vcpkg-configuration": {
|
"vcpkg-configuration": {
|
||||||
"default-registry": {
|
"default-registry": {
|
||||||
"kind": "builtin",
|
"kind": "builtin",
|
||||||
"baseline": "120deac3062162151622ca4860575a33844ba10b"
|
"baseline": "9e593bb18ea69cc5095e012465dcd675a822ed0d"
|
||||||
},
|
},
|
||||||
"overlay-ports": [
|
"overlay-ports": [
|
||||||
"./res/vcpkg"
|
"./res/vcpkg"
|
||||||
|
|||||||
Reference in New Issue
Block a user