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

res/vcpkg: Bump aom to 3.9.1, opus to 1.5.1 and libvpx to 1.14.1 (#8555)

Browse Source 
* res/vcpkg: drop old opus port overlay

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

* res/vcpkg: bump aom to 3.9.1

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

* res/vcpkg: bump libvpx to 1.14.1

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

---------

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
This commit is contained in:
Vasyl Gello
2024-07-03 06:12:19 +00:00
committed by GitHub
parent 182e8c4ac0
commit 6d2e985593
10 changed files with 28 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/vcpkg/aom/aom-rename-static.diff
View File

@@ -1,19 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f459f39c4..d8c1bb2b02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -286,12 +286,12 @@ add_library(aom ${target_objs_aom} $<TARGET_OBJECTS:aom_rtcd>)
if(BUILD_SHARED_LIBS)
add_library(aom_static STATIC ${target_objs_aom} $<TARGET_OBJECTS:aom_rtcd>)
- set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom)
+ set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom_static)
if(MSVC OR (WIN32 AND NOT MINGW))
# Fix race condition on the export library file between the two versions.
# Affects MSVC in all three flavors (stock, Clang/CL, LLVM-- the latter sets
# MSVC and MINGW both to FALSE).
- set_target_properties(aom PROPERTIES ARCHIVE_OUTPUT_NAME "aom_dll")
+ set_target_properties(aom PROPERTIES ARCHIVE_OUTPUT_NAME "aom")
endif()
if(NOT MSVC)

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

@@ -11,9 +11,8 @@ vcpkg_add_to_path(${PERL_PATH})
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL "https://aomedia.googlesource.com/aom"
REF 6054fae218eda6e53e1e3b4f7ef0fff4877c7bf1 # v3.7.0
REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # 3.9.1
PATCHES
aom-rename-static.diff
aom-uninitialized-pointer.diff
# Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream
aom-install.diff
@@ -47,6 +46,13 @@ vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/aom.pc" " -lm" "")
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/aom.pc" " -lm" "")
endif()
endif()
# Move cmake configs
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})

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

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