[libvpx] Update to latest and add support for arm64 on macOS (#18183)

* [libvpx] Update to latest and add support for arm64 on macOS

* [libvpx] x-add-version

* [libvpx] Restore patch line endings

* [libvpx] x-add-version

* Update ports/libvpx/portfile.cmake

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* [libvpx] x-add-version

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

8 files changed, 35 insertions, 50 deletions

diff --git a/ports/libvpx/0001-vcxproj-nasm.patch b/ports/libvpx/0001-vcxproj-nasm.patch
deleted file mode 100644
index eb6333c81..000000000
--- a/ports/libvpx/0001-vcxproj-nasm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh

-index bb1c31d23..b634b0609 100755

---- a/build/make/gen_msvs_vcxproj.sh

-+++ b/build/make/gen_msvs_vcxproj.sh

-@@ -247,13 +247,13 @@ libs=${libs// /;}

- case "$target" in

-     x86_64*)

-         platforms[0]="x64"

--        asm_Debug_cmdline="yasm -Xvc -g cv8 -f win64 ${yasmincs} "%(FullPath)""

--        asm_Release_cmdline="yasm -Xvc -f win64 ${yasmincs} "%(FullPath)""

-+        asm_Debug_cmdline="nasm -Xvc -gcv8 -f win64 ${yasmincs} "%(FullPath)""

-+        asm_Release_cmdline="nasm -Xvc -f win64 ${yasmincs} "%(FullPath)""

-     ;;

-     x86*)

-         platforms[0]="Win32"

--        asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "%(FullPath)""

--        asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "%(FullPath)""

-+        asm_Debug_cmdline="nasm -Xvc -gcv8 -f win32 ${yasmincs} "%(FullPath)""

-+        asm_Release_cmdline="nasm -Xvc -f win32 ${yasmincs} "%(FullPath)""

-     ;;

-     arm64*)

-         platforms[0]="ARM64"

diff --git a/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch b/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch
index 92f1bbac5..9202f4bd9 100644
--- a/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch
+++ b/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch
@@ -1,8 +1,8 @@
 diff --git a/build/make/configure.sh b/build/make/configure.sh

-index 206b54f..49cd13e 100644

+index 81d30a16c..d4f19cd97 100644

 --- a/build/make/configure.sh

 +++ b/build/make/configure.sh

-@@ -1361,12 +1361,14 @@ EOF

+@@ -1370,12 +1370,14 @@ EOF

        case  ${tgt_os} in

          win32)

            add_asflags -f win32

diff --git a/ports/libvpx/0003-add-uwp-and-v142-support.patch b/ports/libvpx/0003-add-uwp-and-v142-support.patch
index 04d4f7cc3..9d689ab59 100644
--- a/ports/libvpx/0003-add-uwp-and-v142-support.patch
+++ b/ports/libvpx/0003-add-uwp-and-v142-support.patch
@@ -1,17 +1,17 @@
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 49cd13e..a627a02 100644
+index d4f19cd97..fb51368b1 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
-@@ -1005,7 +1005,7 @@ EOF
+@@ -1016,7 +1016,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}/build/make/ads2armasm_ms.pl"
+             asm_conversion_cmd="${source_path_mk}/build/make/ads2armasm_ms.pl"
              AS_SFX=.S
              msvs_arch_dir=arm-msvs
-@@ -1237,6 +1237,9 @@ EOF
+@@ -1250,6 +1250,9 @@ EOF
          android)
            soft_enable realtime_only
            ;;
@@ -21,7 +21,7 @@ index 49cd13e..a627a02 100644
          win*)
            enabled gcc && add_cflags -fno-common
            ;;
-@@ -1359,6 +1362,16 @@ EOF
+@@ -1368,6 +1371,16 @@ EOF
        fi
        AS_SFX=.asm
        case  ${tgt_os} in
@@ -38,7 +38,7 @@ index 49cd13e..a627a02 100644
          win32)
            add_asflags -f win32
            enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
-@@ -1479,6 +1492,8 @@ EOF
+@@ -1488,6 +1501,8 @@ EOF
    # Almost every platform uses pthreads.
    if enabled multithread; then
      case ${toolchain} in
@@ -48,10 +48,10 @@ index 49cd13e..a627a02 100644
          ;;
        *-android-gcc)
 diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
-index b634b06..99839dc 100644
+index 6f91ad478..916851662 100755
 --- a/build/make/gen_msvs_vcxproj.sh
 +++ b/build/make/gen_msvs_vcxproj.sh
-@@ -294,7 +294,22 @@ generate_vcxproj() {
+@@ -296,7 +296,22 @@ generate_vcxproj() {
          tag_content ProjectGuid "{${guid}}"
          tag_content RootNamespace ${name}
          tag_content Keyword ManagedCProj
@@ -75,7 +75,7 @@ index b634b06..99839dc 100644
              tag_content AppContainerApplication true
              # The application type can be one of "Windows Store",
              # "Windows Phone" or "Windows Phone Silverlight". The
-@@ -389,7 +404,7 @@ generate_vcxproj() {
+@@ -391,7 +406,7 @@ generate_vcxproj() {
                  Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
              if [ "$name" == "vpx" ]; then
                  hostplat=$plat
@@ -85,12 +85,12 @@ index b634b06..99839dc 100644
                  fi
              fi
 diff --git a/configure b/configure
-index 32272ce..e2231b4 100644
+index da631a45e..da93474e5 100755
 --- a/configure
 +++ b/configure
-@@ -100,16 +100,20 @@ EOF
- all_platforms="${all_platforms} arm64-android-gcc"
+@@ -101,16 +101,20 @@ all_platforms="${all_platforms} arm64-android-gcc"
  all_platforms="${all_platforms} arm64-darwin-gcc"
+ all_platforms="${all_platforms} arm64-darwin20-gcc"
  all_platforms="${all_platforms} arm64-linux-gcc"
 +all_platforms="${all_platforms} arm64-uwp-vs16"
  all_platforms="${all_platforms} arm64-win64-gcc"
@@ -109,7 +109,7 @@ index 32272ce..e2231b4 100644
  all_platforms="${all_platforms} armv7s-darwin-gcc"
  all_platforms="${all_platforms} armv8-linux-gcc"
  all_platforms="${all_platforms} mips32-linux-gcc"
-@@ -134,6 +138,7 @@ all_platforms="${all_platforms} x86-linux-gcc"
+@@ -135,6 +139,7 @@ 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"
@@ -117,7 +117,7 @@ index 32272ce..e2231b4 100644
  all_platforms="${all_platforms} x86-win32-gcc"
  all_platforms="${all_platforms} x86-win32-vs14"
  all_platforms="${all_platforms} x86-win32-vs15"
-@@ -154,6 +159,7 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
+@@ -156,6 +161,7 @@ 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"
@@ -125,7 +125,7 @@ index 32272ce..e2231b4 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"
-@@ -474,11 +480,10 @@ process_targets() {
+@@ -476,11 +482,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}"
@@ -141,7 +141,7 @@ index 32272ce..e2231b4 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}"
-@@ -567,6 +572,10 @@ process_detect() {
+@@ -569,6 +574,10 @@ process_detect() {
  
              # Specialize windows and POSIX environments.
              case $toolchain in
diff --git a/ports/libvpx/0004-remove-library-suffixes.patch b/ports/libvpx/0004-remove-library-suffixes.patch
index fd7b7ad50..c8feaf8f3 100644
--- a/ports/libvpx/0004-remove-library-suffixes.patch
+++ b/ports/libvpx/0004-remove-library-suffixes.patch
@@ -1,8 +1,8 @@
 diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh

-index bb1c31d..9a0827e 100644

+index 916851662..e60405bc9 100755

 --- a/build/make/gen_msvs_vcxproj.sh

 +++ b/build/make/gen_msvs_vcxproj.sh

-@@ -377,7 +377,7 @@ generate_vcxproj() {

+@@ -394,7 +394,7 @@ generate_vcxproj() {

                else

                  config_suffix=""

                fi

diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
index 2f3f3680d..59bf41fe4 100644
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@@ -1,15 +1,14 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(LIBVPX_VERSION 1.9.0)
+set(LIBVPX_VERSION 1.10.0)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO webmproject/libvpx
     REF v${LIBVPX_VERSION}
-    SHA512 8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298
+    SHA512 f88c588145b5164e98531b75215e119056cd806a9dbe6599bb9dab35c0af0ecd4b3daabee7d795e412a58aeb543d5c7dc0107457c4bd8f4d434e966e8e22a32d
     HEAD_REF master
     PATCHES
-        0001-vcxproj-nasm.patch
         0002-Fix-nasm-debug-format-flag.patch
         0003-add-uwp-and-v142-support.patch
         0004-remove-library-suffixes.patch
@@ -165,7 +164,11 @@ else()
 	elseif(VCPKG_TARGET_IS_LINUX)
         set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-linux-gcc")
     elseif(VCPKG_TARGET_IS_OSX)
-        set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS
+        if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+            set(LIBVPX_TARGET "arm64-darwin20-gcc")
+        else()
+            set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS
+        endif()
     else()
         set(LIBVPX_TARGET "generic-gnu") # use default target
     endif()
diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json
index f0991561c..e92896356 100644
--- a/ports/libvpx/vcpkg.json
+++ b/ports/libvpx/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libvpx",
-  "version-semver": "1.9.0",
-  "port-version": 9,
+  "version-semver": "1.10.0",
   "description": "The reference software implementation for the video coding formats VP8 and VP9.",
   "homepage": "https://github.com/webmproject/libvpx"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 4c5551101..1a318b0c5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3669,8 +3669,8 @@
       "port-version": 1
     },
     "libvpx": {
-      "baseline": "1.9.0",
-      "port-version": 9
+      "baseline": "1.10.0",
+      "port-version": 0
     },
     "libwandio": {
       "baseline": "4.2.1",
diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json
index 65efd9346..2a678f182 100644
--- a/versions/l-/libvpx.json
+++ b/versions/l-/libvpx.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "ba9e1f9d346412c76f17d9fda5a3fbd5b5555afa",
+      "version-semver": "1.10.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "dd62b59825999b4a4136fb9e92b393b5600596d1",
       "version-semver": "1.9.0",
       "port-version": 9