From ed94c3859501517cee7ab3a8f2f0397b9bc1bea3 Mon Sep 17 00:00:00 2001
From: CQ_Undefine <60255716+cqundefine@users.noreply.github.com>
Date: Thu, 22 May 2025 09:37:10 +0200
Subject: [PATCH] [libvpx] Fix build on systems where make is not gmake
 (#45569)

---
 ports/libvpx/portfile.cmake | 14 ++++++++++----
 ports/libvpx/vcpkg.json     |  2 +-
 versions/baseline.json      |  2 +-
 versions/l-/libvpx.json     |  5 +++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
index 522b157667..db66bc9111 100644
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@@ -229,6 +229,12 @@ else()
         set(LIBVPX_TARGET "generic-gnu") # use default target
     endif()
 
+    if (VCPKG_HOST_IS_OPENBSD OR VCPKG_HOST_IS_FREEBSD)
+        set(MAKE_BINARY "gmake")
+    else()
+        set(MAKE_BINARY "make")
+    endif()
+
     message(STATUS "Build info. Target: ${LIBVPX_TARGET}; Options: ${OPTIONS}")
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
@@ -249,7 +255,7 @@ else()
         message(STATUS "Building libvpx for Release")
         vcpkg_execute_required_process(
             COMMAND
-                ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
+                ${BASH} --noprofile --norc -c "${MAKE_BINARY} -j${VCPKG_CONCURRENCY}"
             WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
             LOGNAME build-${TARGET_TRIPLET}-rel
         )
@@ -257,7 +263,7 @@ else()
         message(STATUS "Installing libvpx for Release")
         vcpkg_execute_required_process(
             COMMAND
-                ${BASH} --noprofile --norc -c "make install"
+                ${BASH} --noprofile --norc -c "${MAKE_BINARY} install"
             WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
             LOGNAME install-${TARGET_TRIPLET}-rel
         )
@@ -283,7 +289,7 @@ else()
         message(STATUS "Building libvpx for Debug")
         vcpkg_execute_required_process(
             COMMAND
-                ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
+                ${BASH} --noprofile --norc -c "${MAKE_BINARY} -j${VCPKG_CONCURRENCY}"
             WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
             LOGNAME build-${TARGET_TRIPLET}-dbg
         )
@@ -291,7 +297,7 @@ else()
         message(STATUS "Installing libvpx for Debug")
         vcpkg_execute_required_process(
             COMMAND
-                ${BASH} --noprofile --norc -c "make install"
+                ${BASH} --noprofile --norc -c "${MAKE_BINARY} install"
             WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
             LOGNAME install-${TARGET_TRIPLET}-dbg
         )
diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json
index 9f22dbe5e0..897ef7a1ef 100644
--- a/ports/libvpx/vcpkg.json
+++ b/ports/libvpx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libvpx",
   "version": "1.13.1",
-  "port-version": 4,
+  "port-version": 5,
   "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
index d0584c3d97..2f7b5a2950 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5510,7 +5510,7 @@
     },
     "libvpx": {
       "baseline": "1.13.1",
-      "port-version": 4
+      "port-version": 5
     },
     "libwandio": {
       "baseline": "4.2.1",
diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json
index 488eb44d77..cfd86553cc 100644
--- a/versions/l-/libvpx.json
+++ b/versions/l-/libvpx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "71c206529474f4d9bc8f5fbbdb72cc5d13057825",
+      "version": "1.13.1",
+      "port-version": 5
+    },
     {
       "git-tree": "51aa3269c3e4839a7c789ba5e7f25e653ef65b27",
       "version": "1.13.1",