From d261fbf6b6888b4d41ba4b27408fe1c5cde1ea69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= <ggarra13@gmail.com>
Date: Thu, 12 Dec 2024 17:39:37 -0300
Subject: [PATCH] Upgraded libvpx to build with MSVC2022.

---
 .github/workflows/full_win64.yml           | 15 ++++++++-------
 README.md                                  |  2 +-
 bin/compile/compile_ffmpeg_deps_windows.sh |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/full_win64.yml b/.github/workflows/full_win64.yml
index 11b2623d6..be7537424 100644
--- a/.github/workflows/full_win64.yml
+++ b/.github/workflows/full_win64.yml
@@ -1,3 +1,4 @@
+
 name: Win64
 
 on: [push]
@@ -9,7 +10,7 @@ jobs:
   #                                 #
   ###################################
   windows-full-build:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     defaults:
       run:
@@ -24,12 +25,12 @@ jobs:
     - name: Setup environment
       uses: ilammy/msvc-dev-cmd@v1
         
-    - name: Install Visual C++ Redistributable 2019
-      run: |
-         $vc_redist_url = "https://aka.ms/vs/16/release/vc_redist.x64.exe"
-         Invoke-WebRequest -Uri $vc_redist_url -OutFile vc_redist.x64.exe
-         Start-Process vc_redist.x64.exe -ArgumentList "/install", "/quiet", "/norestart" -Wait
-      shell: powershell
+    # - name: Install Visual C++ Redistributable 2019
+    #   run: |
+    #      $vc_redist_url = "https://aka.ms/vs/16/release/vc_redist.x64.exe"
+    #      Invoke-WebRequest -Uri $vc_redist_url -OutFile vc_redist.x64.exe
+    #      Start-Process vc_redist.x64.exe -ArgumentList "/install", "/quiet", "/norestart" -Wait
+    #   shell: powershell
 
     - name: Install Visual C++ Redistributable 2022
       run: |
diff --git a/README.md b/README.md
index 50c9aa60a..e67eccc74 100644
--- a/README.md
+++ b/README.md
@@ -250,7 +250,7 @@ superbuild script.  For a list of non-system libraries that mrv2 depends on
 and their licenses, please refer to src/docs/Legal.
 
 The only special requirement is installing a new copy of cmake than the
-one that ships with MSVC19.
+one that ships with MSVC2022.
 If building the NSIS installer, you need to place the root of mrv2 in a path
 that has less than 20 characters, like:
 
diff --git a/bin/compile/compile_ffmpeg_deps_windows.sh b/bin/compile/compile_ffmpeg_deps_windows.sh
index 06354e270..ca34dfd41 100644
--- a/bin/compile/compile_ffmpeg_deps_windows.sh
+++ b/bin/compile/compile_ffmpeg_deps_windows.sh
@@ -33,7 +33,7 @@ fi
 #
 # Latest TAGS of all libraries
 #
-LIBVPX_TAG=v1.14.1
+LIBVPX_TAG=6f0c446c7b88d384a1c09caf33ec132e7ee24aea
 DAV1D_TAG=1.3.0
 SVTAV1_TAG=v2.1.2
 X264_TAG=stable
@@ -199,7 +199,7 @@ if [[ $TLRENDER_VPX == ON || $TLRENDER_VPX == 1 ]]; then
 	#         latest MSVC on github Actions.
 	#
 	./configure --prefix=$INSTALL_DIR \
-		    --target=x86_64-win64-vs16 \
+		    --target=x86_64-win64-vs17 \
 		    --enable-vp9-highbitdepth \
 		    --disable-unit-tests \
 		    --disable-examples \