From 37c8918683e40a5c64955214ad2fa0ae11cecdbe Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Fri, 15 Jul 2022 13:08:17 +0200
Subject: [PATCH] Update to latest vcpkg and ffmpeg 5.0.1

Remove old download_ffmpeg.bat
---
 Tools/download_ffmpeg.bat | 19 -------------------
 Tools/download_ffmpeg.py  |  5 +++--
 Tools/setup.py            |  6 ++----
 3 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 Tools/download_ffmpeg.bat

diff --git a/Tools/download_ffmpeg.bat b/Tools/download_ffmpeg.bat
deleted file mode 100644
index a662f3e8..00000000
--- a/Tools/download_ffmpeg.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-cd ..
-
-rem Download 7-zip
-curl.exe -L https://www.7-zip.org/a/7z1900.msi --ssl-no-revoke --output 7z.msi
-rem Extract 7z
-msiexec /a 7z.msi /qb TARGETDIR="%cd%\7z"
-
-rem Donwload ffmpeg
-curl.exe -L https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z --ssl-no-revoke --output ffmpeg.7z
-rem Extract ffmpeg
-"%cd%\7z\Files\7-Zip\7z.exe" e -y ffmpeg.7z -o"%cd%\Common\ffmpeg" *.exe *.dll -r
-
-rem Remove not used ffplay
-DEL Common\ffmpeg\ffplay.exe
-
-rem Deleting FFmpeg temp
-DEL ffmpeg.7z
-DEL 7z.msi
-rmdir 7z /s /q
\ No newline at end of file
diff --git a/Tools/download_ffmpeg.py b/Tools/download_ffmpeg.py
index aac502a9..49fafe59 100644
--- a/Tools/download_ffmpeg.py
+++ b/Tools/download_ffmpeg.py
@@ -2,6 +2,7 @@ import zipfile
 from urllib.request import urlopen
 import os
 
+FFMPEG_VERSION ="5.0.1"
 
 def download_and_extract(file_base_path, name):
     print("Download: ", name)
@@ -25,8 +26,8 @@ def download_and_extract(file_base_path, name):
     os.remove(path_and_filename) 
 
 def download_prebuild_ffmpeg():
-    ffmpeg_7zip_name  = 'ffmpeg-4.4.zip'
-    ffprobe_7zip_name = 'ffprobe-4.4.zip'
+    ffmpeg_7zip_name  = f'ffmpeg-{FFMPEG_VERSION}.zip'
+    ffprobe_7zip_name = f'ffprobe-{FFMPEG_VERSION}.zip'
     current_path = os.path.join(os.path.abspath(os.getcwd()),"")
     extraction_path = os.path.abspath(os.path.join(current_path, "../Common/ffmpeg"))
 
diff --git a/Tools/setup.py b/Tools/setup.py
index 16e1bff2..2166897f 100755
--- a/Tools/setup.py
+++ b/Tools/setup.py
@@ -7,9 +7,7 @@ from pathlib import Path
 from execute_util import execute
 from download_ffmpeg import download_prebuild_ffmpeg
 
-vcpkg_version = "2ac61f8"  # Master 23.04.2022
-
-
+vcpkg_version = "98f8d00e89fb6a8019c2045cfa1edbe9d92d3405"  # Master 09.07.2022
 
 class commands_list():
     def __init__(self):
@@ -85,7 +83,7 @@ without the ScreenPlay-vcpkg folder (E.g. py .\setup.py --path "D:/Backup/Code/Q
             platform_command.add("pwsh.exe -NoProfile -ExecutionPolicy Bypass .\scripts\\bootstrap.ps1", vcpkg_path)
         else:
             platform_command.add("bootstrap-vcpkg.bat", vcpkg_path, False)
-        platform_command.add("download_ffmpeg.bat", project_source_path.joinpath("Tools"), False)
+        platform_command.add(download_prebuild_ffmpeg)
         vcpkg_triplet = ["x64-windows"]
     elif system() == "Darwin":
         vcpkg_command = "./vcpkg"