diff --git a/thirdparty/vcpkg-overlays/libvpx/0002-Fix-nasm-debug-format-flag.patch b/thirdparty/vcpkg-overlays/libvpx/0002-Fix-nasm-debug-format-flag.patch
deleted file mode 100644
index 5f4749ae0056c180e42aee71a98b45ebdcfa89ee..0000000000000000000000000000000000000000
--- a/thirdparty/vcpkg-overlays/libvpx/0002-Fix-nasm-debug-format-flag.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 81d30a1..325017e 100644
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -1370,12 +1370,14 @@ EOF
- case ${tgt_os} in
- win32)
- add_asflags -f win32
-- enabled debug && add_asflags -g cv8
-+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
-+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
- EXE_SFX=.exe
- ;;
- win64)
- add_asflags -f win64
-- enabled debug && add_asflags -g cv8
-+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
-+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
- EXE_SFX=.exe
- ;;
- linux*|solaris*|android*)
diff --git a/thirdparty/vcpkg-overlays/libvpx/0003-add-uwp-v142-and-v143-support.patch b/thirdparty/vcpkg-overlays/libvpx/0003-add-uwp-v142-and-v143-support.patch
deleted file mode 100644
index 43cebde3116b355bf6183e64232e73a5444c589c..0000000000000000000000000000000000000000
--- a/thirdparty/vcpkg-overlays/libvpx/0003-add-uwp-v142-and-v143-support.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 110f16e..c161d0e 100644
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -1038,7 +1038,7 @@ EOF
- # A number of ARM-based Windows platforms are constrained by their
- # respective SDKs' limitations. Fortunately, these are all 32-bit ABIs
- # and so can be selected as 'win32'.
-- if [ ${tgt_os} = "win32" ]; then
-+ if [ ${tgt_os} = "win32" ] || [ ${tgt_isa} = "armv7" ]; then
- asm_conversion_cmd="${source_path_mk}/build/make/ads2armasm_ms.pl"
- AS_SFX=.S
- msvs_arch_dir=arm-msvs
-@@ -1272,6 +1272,9 @@ EOF
- android)
- soft_enable realtime_only
- ;;
-+ uwp)
-+ enabled gcc && add_cflags -fno-common
-+ ;;
- win*)
- enabled gcc && add_cflags -fno-common
- ;;
-@@ -1390,6 +1393,16 @@ EOF
- fi
- AS_SFX=.asm
- case ${tgt_os} in
-+ uwp)
-+ if [ {$tgt_isa} = "x86" ] || [ {$tgt_isa} = "armv7" ]; then
-+ add_asflags -f win32
-+ else
-+ add_asflags -f win64
-+ fi
-+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
-+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
-+ EXE_SFX=.exe
-+ ;;
- win32)
- add_asflags -f win32
- enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
-@@ -1519,6 +1532,8 @@ EOF
- # Almost every platform uses pthreads.
- if enabled multithread; then
- case ${toolchain} in
-+ *-uwp-vs*)
-+ ;;
- *-win*-vs*)
- ;;
- *-android-gcc)
-diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
-index 58bb66b..b4cad6c 100644
---- a/build/make/gen_msvs_vcxproj.sh
-+++ b/build/make/gen_msvs_vcxproj.sh
-@@ -296,7 +296,22 @@ generate_vcxproj() {
- tag_content ProjectGuid "{${guid}}"
- tag_content RootNamespace ${name}
- tag_content Keyword ManagedCProj
-- if [ $vs_ver -ge 12 ] && [ "${platforms[0]}" = "ARM" ]; then
-+ if [ $vs_ver -ge 16 ]; then
-+ if [[ $target =~ [^-]*-uwp-.* ]]; then
-+ # Universal Windows Applications
-+ tag_content AppContainerApplication true
-+ tag_content ApplicationType "Windows Store"
-+ tag_content ApplicationTypeRevision 10.0
-+ fi
-+ if [[ $target =~ [^-]*-uwp-.* ]] || [ "${platforms[0]}" = "ARM" ] || [ "${platforms[0]}" = "ARM64" ]; then
-+ # Default to the latest Windows 10 SDK
-+ tag_content WindowsTargetPlatformVersion 10.0
-+ else
-+ # Minimum supported version of Windows for the desktop
-+ tag_content WindowsTargetPlatformVersion 8.1
-+ fi
-+ tag_content MinimumVisualStudioVersion 16.0
-+ elif [ $vs_ver -ge 12 ] && [ "${platforms[0]}" = "ARM" ]; then
- tag_content AppContainerApplication true
- # The application type can be one of "Windows Store",
- # "Windows Phone" or "Windows Phone Silverlight". The
-@@ -394,7 +409,7 @@ generate_vcxproj() {
- Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
- if [ "$name" == "vpx" ]; then
- hostplat=$plat
-- if [ "$hostplat" == "ARM" ]; then
-+ if [ "$hostplat" == "ARM" ] && [ $vs_ver -le 15 ]; then
- hostplat=Win32
- fi
- fi
-diff --git a/configure b/configure
-index ae289f7..78f5fc1 100644
---- a/configure
-+++ b/configure
-@@ -103,6 +103,8 @@ all_platforms="${all_platforms} arm64-darwin20-gcc"
- all_platforms="${all_platforms} arm64-darwin21-gcc"
- all_platforms="${all_platforms} arm64-darwin22-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
- 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
-+all_platforms="${all_platforms} armv7-uwp-vs16"
-+all_platforms="${all_platforms} armv7-uwp-vs17"
- 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"
- all_platforms="${all_platforms} x86-linux-icc"
- all_platforms="${all_platforms} x86-os2-gcc"
- all_platforms="${all_platforms} x86-solaris-gcc"
-+all_platforms="${all_platforms} x86-uwp-vs16"
-+all_platforms="${all_platforms} x86-uwp-vs17"
- 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"
- all_platforms="${all_platforms} x86_64-linux-gcc"
- all_platforms="${all_platforms} x86_64-linux-icc"
- all_platforms="${all_platforms} x86_64-solaris-gcc"
-+all_platforms="${all_platforms} x86_64-uwp-vs16"
-+all_platforms="${all_platforms} x86_64-uwp-vs17"
- 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() {
- ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt"
- ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs"
- DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}"
-- case "${tgt_os}" in
-- win*) enabled static_msvcrt && DIST_DIR="${DIST_DIR}mt" || DIST_DIR="${DIST_DIR}md"
-- DIST_DIR="${DIST_DIR}-${tgt_cc}"
-- ;;
-- esac
-+ if [[ ${tgt_os} =~ win.* ]] || [ "${tgt_os}" = "uwp" ]; then
-+ enabled static_msvcrt && DIST_DIR="${DIST_DIR}mt" || DIST_DIR="${DIST_DIR}md"
-+ DIST_DIR="${DIST_DIR}-${tgt_cc}"
-+ fi
- 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() {
-
- # Specialize windows and POSIX environments.
- case $toolchain in
-+ *-uwp-*)
-+ # Don't check for any headers in UWP builds.
-+ false
-+ ;;
- *-win*-*)
- # Don't check for any headers in Windows builds.
- false
diff --git a/thirdparty/vcpkg-overlays/libvpx/0004-remove-library-suffixes.patch b/thirdparty/vcpkg-overlays/libvpx/0004-remove-library-suffixes.patch
deleted file mode 100644
index e7f827d7b156ab077f06e65381c35d23d667785c..0000000000000000000000000000000000000000
--- a/thirdparty/vcpkg-overlays/libvpx/0004-remove-library-suffixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
-index 916851662..e60405bc9 100755
---- a/build/make/gen_msvs_vcxproj.sh
-+++ b/build/make/gen_msvs_vcxproj.sh
-@@ -394,7 +394,7 @@ generate_vcxproj() {
- else
- config_suffix=""
- fi
-- tag_content TargetName "${name}${lib_sfx}${config_suffix}"
-+ tag_content TargetName "${name}"
- fi
- close_tag PropertyGroup
- done
diff --git a/thirdparty/vcpkg-overlays/libvpx/0005-fix-arm64-build.patch b/thirdparty/vcpkg-overlays/libvpx/0005-fix-arm64-build.patch
deleted file mode 100644
index 76c0c8171f7b319f0048e28995225a552a727685..0000000000000000000000000000000000000000
--- a/thirdparty/vcpkg-overlays/libvpx/0005-fix-arm64-build.patch
+++ /dev/null
@@ -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
diff --git a/thirdparty/vcpkg-overlays/libvpx/portfile.cmake b/thirdparty/vcpkg-overlays/libvpx/portfile.cmake
deleted file mode 100644
index 1283e062778e4ab4acfdbcc3b3233960c2214c02..0000000000000000000000000000000000000000
--- a/thirdparty/vcpkg-overlays/libvpx/portfile.cmake
+++ /dev/null
@@ -1,312 +0,0 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO webmproject/libvpx
- REF "v${VERSION}"
- SHA512 49706838563c92fab7334376848d0f374efcbc1729ef511e967c908fd2ecd40e8d197f1d85da6553b3a7026bdbc17e5a76595319858af26ce58cb9a4c3854897
- 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
-)
-
-if(CMAKE_HOST_WIN32)
- vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl)
- set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
- set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH}")
-else()
- vcpkg_find_acquire_program(PERL)
- get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
- set(BASH /bin/bash)
- set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}")
-endif()
-
-vcpkg_find_acquire_program(NASM)
-get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
-vcpkg_add_to_path(${NASM_EXE_PATH})
-
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-
- file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp")
-
- if(VCPKG_CRT_LINKAGE STREQUAL static)
- set(LIBVPX_CRT_LINKAGE --enable-static-msvcrt)
- set(LIBVPX_CRT_SUFFIX mt)
- else()
- set(LIBVPX_CRT_SUFFIX md)
- endif()
-
- if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND (VCPKG_PLATFORM_TOOLSET STREQUAL v142 OR VCPKG_PLATFORM_TOOLSET STREQUAL v143))
- set(LIBVPX_TARGET_OS "uwp")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
- set(LIBVPX_TARGET_OS "win32")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
- set(LIBVPX_TARGET_OS "win64")
- endif()
-
- if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
- set(LIBVPX_TARGET_ARCH "x86-${LIBVPX_TARGET_OS}")
- set(LIBVPX_ARCH_DIR "Win32")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
- set(LIBVPX_TARGET_ARCH "x86_64-${LIBVPX_TARGET_OS}")
- set(LIBVPX_ARCH_DIR "x64")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
- set(LIBVPX_TARGET_ARCH "arm64-${LIBVPX_TARGET_OS}")
- set(LIBVPX_ARCH_DIR "ARM64")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
- set(LIBVPX_TARGET_ARCH "armv7-${LIBVPX_TARGET_OS}")
- set(LIBVPX_ARCH_DIR "ARM")
- endif()
-
- if(VCPKG_PLATFORM_TOOLSET STREQUAL v143)
- set(LIBVPX_TARGET_VS "vs17")
- elseif(VCPKG_PLATFORM_TOOLSET STREQUAL v142)
- set(LIBVPX_TARGET_VS "vs16")
- else()
- set(LIBVPX_TARGET_VS "vs15")
- endif()
-
- set(OPTIONS "--disable-examples --disable-tools --disable-docs --enable-pic")
-
- if("realtime" IN_LIST FEATURES)
- set(OPTIONS "${OPTIONS} --enable-realtime-only")
- endif()
-
- if("highbitdepth" IN_LIST FEATURES)
- set(OPTIONS "${OPTIONS} --enable-vp9-highbitdepth")
- endif()
-
- message(STATUS "Generating makefile")
- file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp")
- vcpkg_execute_required_process(
- COMMAND
- ${BASH} --noprofile --norc
- "${SOURCE_PATH}/configure"
- --target=${LIBVPX_TARGET_ARCH}-${LIBVPX_TARGET_VS}
- ${LIBVPX_CRT_LINKAGE}
- ${OPTIONS}
- --as=nasm
- WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp"
- LOGNAME configure-${TARGET_TRIPLET})
-
- message(STATUS "Generating MSBuild projects")
- vcpkg_execute_required_process(
- COMMAND
- ${BASH} --noprofile --norc -c "make dist"
- WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp"
- LOGNAME generate-${TARGET_TRIPLET})
-
- vcpkg_msbuild_install(
- SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp"
- PROJECT_SUBPATH vpx.vcxproj
- )
-
- if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
- set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx")
- elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
- set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx")
- else()
- set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx")
- endif()
- file(
- INSTALL
- "${LIBVPX_INCLUDE_DIR}"
- DESTINATION
- "${CURRENT_PACKAGES_DIR}/include"
- RENAME
- "vpx")
- if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
- set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}")
- configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vpx.pc" @ONLY)
- endif()
-
- if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
- set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}/debug")
- configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY)
- endif()
-
-else()
-
- set(OPTIONS "--disable-examples --disable-tools --disable-docs --disable-unit-tests --enable-pic")
-
- set(OPTIONS_DEBUG "--enable-debug-libs --enable-debug --prefix=${CURRENT_PACKAGES_DIR}/debug")
- set(OPTIONS_RELEASE "--prefix=${CURRENT_PACKAGES_DIR}")
- set(AS_NASM "--as=nasm")
-
- if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- set(OPTIONS "${OPTIONS} --disable-static --enable-shared")
- else()
- set(OPTIONS "${OPTIONS} --enable-static --disable-shared")
- endif()
-
- if("realtime" IN_LIST FEATURES)
- set(OPTIONS "${OPTIONS} --enable-realtime-only")
- endif()
-
- if("highbitdepth" IN_LIST FEATURES)
- set(OPTIONS "${OPTIONS} --enable-vp9-highbitdepth")
- endif()
-
- if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
- set(LIBVPX_TARGET_ARCH "x86")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
- set(LIBVPX_TARGET_ARCH "x86_64")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
- set(LIBVPX_TARGET_ARCH "armv7")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
- set(LIBVPX_TARGET_ARCH "arm64")
- else()
- message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE}")
- endif()
-
- vcpkg_cmake_get_vars(cmake_vars_file)
- include("${cmake_vars_file}")
-
- # Set environment variables for configure
- if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$")
- message(STATUS "Cross-building for ${TARGET_TRIPLET} with ${CMAKE_MATCH_1}")
- set(ENV{CROSS} ${CMAKE_MATCH_1})
- unset(AS_NASM)
- else()
- set(ENV{CC} ${VCPKG_DETECTED_CMAKE_C_COMPILER})
- set(ENV{CXX} ${VCPKG_DETECTED_CMAKE_CXX_COMPILER})
- set(ENV{AR} ${VCPKG_DETECTED_CMAKE_AR})
- set(ENV{LD} ${VCPKG_DETECTED_CMAKE_LINKER})
- set(ENV{RANLIB} ${VCPKG_DETECTED_CMAKE_RANLIB})
- set(ENV{STRIP} ${VCPKG_DETECTED_CMAKE_STRIP})
- endif()
-
- if(VCPKG_TARGET_IS_MINGW)
- if(LIBVPX_TARGET_ARCH STREQUAL "x86")
- set(LIBVPX_TARGET "x86-win32-gcc")
- else()
- set(LIBVPX_TARGET "x86_64-win64-gcc")
- endif()
- elseif(VCPKG_TARGET_IS_LINUX)
- set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-linux-gcc")
- elseif(VCPKG_TARGET_IS_ANDROID)
- set(LIBVPX_TARGET "generic-gnu")
- # Settings
- if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
- set(OPTIONS "${OPTIONS} --disable-sse4_1 --disable-avx --disable-avx2 --disable-avx512")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
- set(OPTIONS "${OPTIONS} --disable-avx --disable-avx2 --disable-avx512")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
- set(OPTIONS "${OPTIONS} --enable-thumb --disable-neon")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
- set(OPTIONS "${OPTIONS} --enable-thumb")
- endif()
- # Set environment variables for configure
- set(ENV{AS} ${VCPKG_DETECTED_CMAKE_C_COMPILER})
- set(ENV{LDFLAGS} "${LDFLAGS} --target=${VCPKG_DETECTED_CMAKE_C_COMPILER_TARGET}")
- # Set clang target
- set(OPTIONS "${OPTIONS} --extra-cflags=--target=${VCPKG_DETECTED_CMAKE_C_COMPILER_TARGET} --extra-cxxflags=--target=${VCPKG_DETECTED_CMAKE_CXX_COMPILER_TARGET}")
- # Unset nasm and let AS do its job
- unset(AS_NASM)
- elseif(VCPKG_TARGET_IS_OSX)
- if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
- set(LIBVPX_TARGET "arm64-darwin20-gcc")
- if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET)
- set(MAC_OSX_MIN_VERSION_CFLAGS --extra-cflags=-mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET} --extra-cxxflags=-mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET})
- endif()
- else()
- set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS
- endif()
- elseif(VCPKG_TARGET_IS_IOS)
- if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
- set(LIBVPX_TARGET "armv7-darwin-gcc")
- elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
- set(LIBVPX_TARGET "arm64-darwin-gcc")
- else()
- message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE} on iOS")
- endif()
- else()
- set(LIBVPX_TARGET "generic-gnu") # use default target
- endif()
-
- message(STATUS "Build info. Target: ${LIBVPX_TARGET}; Options: ${OPTIONS}")
-
- if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
- message(STATUS "Configuring libvpx for Release")
- file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
- vcpkg_execute_required_process(
- COMMAND
- ${BASH} --noprofile --norc
- "${SOURCE_PATH}/configure"
- --target=${LIBVPX_TARGET}
- ${OPTIONS}
- ${OPTIONS_RELEASE}
- ${MAC_OSX_MIN_VERSION_CFLAGS}
- ${AS_NASM}
- WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- LOGNAME configure-${TARGET_TRIPLET}-rel)
-
- message(STATUS "Building libvpx for Release")
- vcpkg_execute_required_process(
- COMMAND
- ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
- WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- LOGNAME build-${TARGET_TRIPLET}-rel
- )
-
- message(STATUS "Installing libvpx for Release")
- vcpkg_execute_required_process(
- COMMAND
- ${BASH} --noprofile --norc -c "make install"
- WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- LOGNAME install-${TARGET_TRIPLET}-rel
- )
- endif()
-
- # --- --- ---
-
- if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
- message(STATUS "Configuring libvpx for Debug")
- file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
- vcpkg_execute_required_process(
- COMMAND
- ${BASH} --noprofile --norc
- "${SOURCE_PATH}/configure"
- --target=${LIBVPX_TARGET}
- ${OPTIONS}
- ${OPTIONS_DEBUG}
- ${MAC_OSX_MIN_VERSION_CFLAGS}
- ${AS_NASM}
- WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
- LOGNAME configure-${TARGET_TRIPLET}-dbg)
-
- message(STATUS "Building libvpx for Debug")
- vcpkg_execute_required_process(
- COMMAND
- ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
- WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
- LOGNAME build-${TARGET_TRIPLET}-dbg
- )
-
- message(STATUS "Installing libvpx for Debug")
- vcpkg_execute_required_process(
- COMMAND
- ${BASH} --noprofile --norc -c "make install"
- WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
- LOGNAME install-${TARGET_TRIPLET}-dbg
- )
-
- file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
- file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libvpx_g.a")
- endif()
-endif()
-
-vcpkg_fixup_pkgconfig()
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
- set(LIBVPX_CONFIG_DEBUG ON)
-else()
- set(LIBVPX_CONFIG_DEBUG OFF)
-endif()
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-libvpx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-libvpx/unofficial-libvpx-config.cmake" @ONLY)
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/thirdparty/vcpkg-overlays/libvpx/unofficial-libvpx-config.cmake.in b/thirdparty/vcpkg-overlays/libvpx/unofficial-libvpx-config.cmake.in
deleted file mode 100644
index d3844d36612f9993af94cf44e08b629b25c15232..0000000000000000000000000000000000000000
--- a/thirdparty/vcpkg-overlays/libvpx/unofficial-libvpx-config.cmake.in
+++ /dev/null
@@ -1,49 +0,0 @@
-if(NOT TARGET unofficial::libvpx::libvpx)
- # Compute the installation prefix relative to this file.
- get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
- get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
- get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-
- # Add library target (note: vpx always has a static build in vcpkg).
- add_library(unofficial::libvpx::libvpx STATIC IMPORTED)
-
- # Add interface include directories and link interface languages (applies to all configurations).
- set_target_properties(unofficial::libvpx::libvpx PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- )
- list(APPEND _IMPORT_CHECK_FILES "${_IMPORT_PREFIX}/include/vpx/vpx_codec.h")
-
- # Add release configuration properties.
- find_library(_LIBFILE_RELEASE NAMES vpx PATHS "${_IMPORT_PREFIX}/lib/" NO_DEFAULT_PATH)
- set_property(TARGET unofficial::libvpx::libvpx
- APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(unofficial::libvpx::libvpx PROPERTIES
- IMPORTED_LOCATION_RELEASE ${_LIBFILE_RELEASE})
- list(APPEND _IMPORT_CHECK_FILES ${_LIBFILE_RELEASE})
- unset(_LIBFILE_RELEASE CACHE)
-
- # Add debug configuration properties.
- if(@LIBVPX_CONFIG_DEBUG@)
- find_library(_LIBFILE_DEBUG NAMES vpx PATHS "${_IMPORT_PREFIX}/debug/lib/" NO_DEFAULT_PATH)
- set_property(TARGET unofficial::libvpx::libvpx
- APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
- set_target_properties(unofficial::libvpx::libvpx PROPERTIES
- IMPORTED_LOCATION_DEBUG ${_LIBFILE_DEBUG})
- list(APPEND _IMPORT_CHECK_FILES ${_LIBFILE_DEBUG})
- unset(_LIBFILE_DEBUG CACHE)
- endif()
-
- # Check header and library files are present.
- foreach(file ${_IMPORT_CHECK_FILES} )
- if(NOT EXISTS "${file}" )
- message(FATAL_ERROR "unofficial::libvpx::libvpx references the file
- \"${file}\"
-but this file does not exist. Possible reasons include:
-* The file was deleted, renamed, or moved to another location.
-* An install or uninstall procedure did not complete successfully.
-")
- endif()
- endforeach()
- unset(_IMPORT_CHECK_FILES)
-endif()
diff --git a/thirdparty/vcpkg-overlays/libvpx/vcpkg.json b/thirdparty/vcpkg-overlays/libvpx/vcpkg.json
deleted file mode 100644
index 0a11ff7eab8d565678ef960333ff1b3feb0cd216..0000000000000000000000000000000000000000
--- a/thirdparty/vcpkg-overlays/libvpx/vcpkg.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "name": "libvpx",
- "version": "1.13.1",
- "description": "The reference software implementation for the video coding formats VP8 and VP9.",
- "homepage": "https://github.com/webmproject/libvpx",
- "license": "BSD-3-Clause",
- "dependencies": [
- {
- "name": "vcpkg-cmake-get-vars",
- "host": true
- },
- {
- "name": "vcpkg-msbuild",
- "host": true,
- "platform": "windows"
- }
- ],
- "features": {
- "highbitdepth": {
- "description": "use VP9 high bit depth (10/12) profiles"
- },
- "realtime": {
- "description": "enable this option while building for real-time encoding"
- }
- }
-}
diff --git a/thirdparty/vcpkg-overlays/libvpx/vpx.pc.in b/thirdparty/vcpkg-overlays/libvpx/vpx.pc.in
deleted file mode 100644
index 6df64d4b4dbdde6d084c9f10a148b49145e1c9fc..0000000000000000000000000000000000000000
--- a/thirdparty/vcpkg-overlays/libvpx/vpx.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@LIBVPX_PREFIX@
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: vpx
-Description: WebM Project VPx codec implementation
-Version: @VERSION@
-Requires:
-Conflicts:
-Libs: -L"${libdir}" -lvpx
-Cflags: -I"${includedir}"
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
index 102a004085876d2fc35b15f8f9e9499a731bc9a3..0bdeb51e02020164a5064d77605553ec752e58d3 100644
--- a/vcpkg-configuration.json
+++ b/vcpkg-configuration.json
@@ -1,6 +1,3 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
- "overlay-ports": [
- "./thirdparty/vcpkg-overlays"
- ]
+ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json"
}
diff --git a/vcpkg.json b/vcpkg.json
index 505ca3d6d910d3808af64ba4f4afb931ed9a5404..7d58a74aa7b7d5f37acfa4911355307d71e9a804 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -12,5 +12,5 @@
"libyuv",
"zlib"
],
- "builtin-baseline": "000d1bda1ffa95a73e0b40334fa4103d6f4d3d48"
+ "builtin-baseline": "c591ac6466a55ef0a05a3d56bb1489ca36e50102"
}