[libvpx] Use msys2 perl on win32 hosts (#35593)

microsoft · Dec 20, 2023 · cd80671 · cd80671
1 parent 4b2d315
commit cd80671
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
@@ -13,18 +13,16 @@ vcpkg_from_github(
         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(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()
+    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)
 
+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)

diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libvpx",
   "version": "1.13.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The reference software implementation for the video coding formats VP8 and VP9.",
   "homepage": "https://github.com/webmproject/libvpx",
   "license": "BSD-3-Clause",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5010,7 +5010,7 @@
     },
     "libvpx": {
       "baseline": "1.13.1",
-      "port-version": 1
+      "port-version": 2
     },
     "libwandio": {
       "baseline": "4.2.1",

diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "66ea767e9ce55da152694d49a74ad2125ca4d937",
+      "version": "1.13.1",
+      "port-version": 2
+    },
     {
       "git-tree": "88491a53de6cdc69ec82882d44aab8cf3b315577",
       "version": "1.13.1",