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

* 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>
2024-11-23 19:49:05 +08:00 · 2024-07-03 06:12:19 +00:00 · 2024-07-03 06:12:19 +00:00 · 6d2e985593
commit 6d2e985593
parent 182e8c4ac0
10 changed files with 28 additions and 151 deletions
--- a/res/vcpkg/aom/aom-rename-static.diff
+++ b/res/vcpkg/aom/aom-rename-static.diff
@ -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)
--- a/res/vcpkg/aom/portfile.cmake
+++ b/res/vcpkg/aom/portfile.cmake
@ -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})

--- a/res/vcpkg/aom/vcpkg.json
+++ b/res/vcpkg/aom/vcpkg.json
@ -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",
--- a/res/vcpkg/libvpx/0003-add-uwp-v142-and-v143-support.patch
+++ b/res/vcpkg/libvpx/0003-add-uwp-v142-and-v143-support.patch
@ -85,19 +85,19 @@ index 58bb66b..b4cad6c 100644
                 fi
             fi
 diff --git a/configure b/configure
-index ae289f7..78f5fc1 100644
+index b212e07..1a9fa98 100755
 --- a/configure
 +++ b/configure
-@@ -103,6 +103,8 @@ all_platforms="${all_platforms} arm64-darwin20-gcc"
- all_platforms="${all_platforms} arm64-darwin21-gcc"
+@@ -104,6 +104,8 @@ all_platforms="${all_platforms} arm64-darwin21-gcc"
 all_platforms="${all_platforms} arm64-darwin22-gcc"
+ all_platforms="${all_platforms} arm64-darwin23-gcc"
 all_platforms="${all_platforms} arm64-linux-gcc"
 +all_platforms="${all_platforms} arm64-uwp-vs16"
 +all_platforms="${all_platforms} arm64-uwp-vs17"
 all_platforms="${all_platforms} arm64-win64-gcc"
 all_platforms="${all_platforms} arm64-win64-vs15"
 all_platforms="${all_platforms} arm64-win64-vs16"
-@@ -112,6 +114,8 @@ all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
+@@ -115,6 +117,8 @@ all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
 all_platforms="${all_platforms} armv7-linux-rvct"    #neon Cortex-A8
 all_platforms="${all_platforms} armv7-linux-gcc"     #neon Cortex-A8
 all_platforms="${all_platforms} armv7-none-rvct"     #neon Cortex-A8
@ -106,7 +106,7 @@ index ae289f7..78f5fc1 100644
 all_platforms="${all_platforms} armv7-win32-gcc"
 all_platforms="${all_platforms} armv7-win32-vs14"
 all_platforms="${all_platforms} armv7-win32-vs15"
-@@ -143,6 +147,8 @@ all_platforms="${all_platforms} x86-linux-gcc"
+@@ -146,6 +150,8 @@ all_platforms="${all_platforms} x86-linux-gcc"
 all_platforms="${all_platforms} x86-linux-icc"
 all_platforms="${all_platforms} x86-os2-gcc"
 all_platforms="${all_platforms} x86-solaris-gcc"
@ -115,7 +115,7 @@ index ae289f7..78f5fc1 100644
 all_platforms="${all_platforms} x86-win32-gcc"
 all_platforms="${all_platforms} x86-win32-vs14"
 all_platforms="${all_platforms} x86-win32-vs15"
-@@ -167,6 +173,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
+@@ -171,6 +177,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
 all_platforms="${all_platforms} x86_64-linux-gcc"
 all_platforms="${all_platforms} x86_64-linux-icc"
 all_platforms="${all_platforms} x86_64-solaris-gcc"
@ -124,7 +124,7 @@ index ae289f7..78f5fc1 100644
 all_platforms="${all_platforms} x86_64-win64-gcc"
 all_platforms="${all_platforms} x86_64-win64-vs14"
 all_platforms="${all_platforms} x86_64-win64-vs15"
-@@ -491,11 +499,10 @@ process_targets() {
+@@ -503,11 +511,10 @@ process_targets() {
     ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt"
     ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs"
     DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}"
@ -140,7 +140,7 @@ index ae289f7..78f5fc1 100644
     if [ -f "${source_path}/build/make/version.sh" ]; then
         ver=`"$source_path/build/make/version.sh" --bare "$source_path"`
         DIST_DIR="${DIST_DIR}-${ver}"
-@@ -584,6 +591,10 @@ process_detect() {
+@@ -596,6 +603,10 @@ process_detect() {
 
             # Specialize windows and POSIX environments.
             case $toolchain in
--- a/res/vcpkg/libvpx/0005-fix-arm64-build.patch
+++ b/res/vcpkg/libvpx/0005-fix-arm64-build.patch
@ -1,13 +0,0 @@
-diff --git a/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c b/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c
-index 33753f7..997775a 100644
--- a/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c
-+++ b/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c
-@@ -220,7 +220,7 @@ int vp9_diamond_search_sad_neon(const MACROBLOCK *x,
-       // Look up the component cost of the residual motion vector
-       {
-         uint32_t cost[4];
-        int16_t __attribute__((aligned(16))) rowcol[8];
-+        DECLARE_ALIGNED(16, int16_t, rowcol[8]);
-         vst1q_s16(rowcol, v_diff_mv_w);
- 
-         // Note: This is a use case for gather instruction
--- a/res/vcpkg/libvpx/portfile.cmake
+++ b/res/vcpkg/libvpx/portfile.cmake
@ -4,28 +4,25 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO webmproject/libvpx
    REF "v${VERSION}"
-    SHA512 49706838563c92fab7334376848d0f374efcbc1729ef511e967c908fd2ecd40e8d197f1d85da6553b3a7026bdbc17e5a76595319858af26ce58cb9a4c3854897
+    SHA512 3e3bfad3d035c0bc3db7cb5a194d56d3c90f5963fb1ad527ae5252054e7c48ce2973de1346c97d94b59f7a95d4801bec44214cce10faf123f92b36fca79a8d1e
    HEAD_REF master
    PATCHES
        0002-Fix-nasm-debug-format-flag.patch
        0003-add-uwp-v142-and-v143-support.patch
        0004-remove-library-suffixes.patch
-        0005-fix-arm64-build.patch # Upstream commit: https://github.com/webmproject/libvpx/commit/858a8c611f4c965078485860a6820e2135e6611b
 )

-vcpkg_find_acquire_program(PERL)
-
-get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-
 if(CMAKE_HOST_WIN32)
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)
-    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
-    set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl)
+    set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH}")
 else()
-    set(BASH /bin/bash)
+    vcpkg_find_acquire_program(PERL)
+    get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
    set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}")
 endif()

+find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE)
+
 vcpkg_find_acquire_program(NASM)
 get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
 vcpkg_add_to_path(${NASM_EXE_PATH})
--- a/res/vcpkg/libvpx/vcpkg.json
+++ b/res/vcpkg/libvpx/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "libvpx",
-  "version": "1.13.1",
+  "version": "1.14.1",
+  "port-version": 0,
  "description": "The reference software implementation for the video coding formats VP8 and VP9.",
  "homepage": "https://github.com/webmproject/libvpx",
  "license": "BSD-3-Clause",
@ -12,7 +13,7 @@
    {
      "name": "vcpkg-msbuild",
      "host": true,
-      "platform": "windows"
+      "platform": "windows & !mingw"
    }
  ],
  "features": {
--- a/res/vcpkg/opus/fix-pkgconfig-version.patch
+++ b/res/vcpkg/opus/fix-pkgconfig-version.patch
@ -1,15 +0,0 @@
-diff --git a/cmake/OpusPackageVersion.cmake b/cmake/OpusPackageVersion.cmake
-index 447ce3b..15ebd8e 100644
--- a/cmake/OpusPackageVersion.cmake
-+++ b/cmake/OpusPackageVersion.cmake
-@@ -4,7 +4,9 @@ endif()
- set(__opus_version INCLUDED)
- 
- function(get_package_version PACKAGE_VERSION PROJECT_VERSION)
-
-+  set(PACKAGE_VERSION "0" CACHE STRING "opus package version")
-+  set(PROJECT_VERSION "0" CACHE STRING "opus project version")
-+  return()
-   find_package(Git)
-   if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
-     execute_process(COMMAND ${GIT_EXECUTABLE}
--- a/res/vcpkg/opus/portfile.cmake
+++ b/res/vcpkg/opus/portfile.cmake
@ -1,58 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO xiph/opus
-    REF "v${VERSION}"
-    SHA512 86df35cd62ebf3551b2739effb8f818d635656d91d386d7d600a424a92c4c0d6bfbc3986f1ec6cf4950910ac87b28dc9640b9df3b9a6a5a75eb37ae71782b72e
-    HEAD_REF master
-    PATCHES fix-pkgconfig-version.patch
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        avx AVX_SUPPORTED
-)
-
-set(ADDITIONAL_OPUS_OPTIONS "")
-if(VCPKG_TARGET_IS_MINGW)
-    set(STACK_PROTECTOR OFF)
-    string(APPEND VCPKG_C_FLAGS "-D_FORTIFY_SOURCE=0")
-    string(APPEND VCPKG_CXX_FLAGS "-D_FORTIFY_SOURCE=0")
-elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
-    set(STACK_PROTECTOR OFF)
-else()
-    set(STACK_PROTECTOR ON)
-endif()
-
-if((VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") OR
-   (VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") OR
-   (VCPKG_TARGET_IS_ANDROID AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_CMAKE_CONFIGURE_OPTIONS MATCHES "ANDROID_ARM_NEON"))
-    message(STATUS "Disabling ARM NEON and intrinsics on ${TARGET_TRIPLET}")
-    list(APPEND ADDITIONAL_OPUS_OPTIONS "-DOPUS_DISABLE_INTRINSICS=ON -DCOMPILER_SUPPORTS_NEON=OFF") # for HEAD (and future Opus release)
-endif()
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS ${FEATURE_OPTIONS}
-        -DPACKAGE_VERSION=${VERSION}
-        -DOPUS_STACK_PROTECTOR=${STACK_PROTECTOR}
-        -DOPUS_INSTALL_PKG_CONFIG_MODULE=ON
-        -DOPUS_INSTALL_CMAKE_CONFIG_MODULE=ON
-        -DOPUS_BUILD_PROGRAMS=OFF
-        -DOPUS_BUILD_TESTING=OFF
-        ${ADDITIONAL_OPUS_OPTIONS}
-    MAYBE_UNUSED_VARIABLES
-        OPUS_USE_NEON
-        OPUS_DISABLE_INTRINSICS
-)
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Opus)
-vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m)
-
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake"
-                    "${CURRENT_PACKAGES_DIR}/lib/cmake"
-                    "${CURRENT_PACKAGES_DIR}/debug/include")
-
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/res/vcpkg/opus/vcpkg.json
+++ b/res/vcpkg/opus/vcpkg.json
@ -1,23 +0,0 @@
-{
-  "name": "opus",
-  "version": "1.4",
-  "port-version": 1,
-  "description": "Totally open, royalty-free, highly versatile audio codec",
-  "homepage": "https://github.com/xiph/opus",
-  "license": "BSD-3-Clause",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ],
-  "features": {
-    "avx": {
-      "description": "Builds the library with avx instruction set"
-    }
-  }
-}