Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Code Issues Projects Releases Activity

Update to latest vcpkg and ffmpeg 5.0.1

Browse Source 
Remove old download_ffmpeg.bat
This commit is contained in:
Elias Steurer 2022-07-15 13:08:17 +02:00
parent 9419242bcb
commit 37c8918683
3 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Tools/download_ffmpeg.bat
View File

@ -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

5
Tools/download_ffmpeg.py
View File

@ -2,6 +2,7 @@ import zipfile
from urllib.request import urlopen from urllib.request import urlopen
import os import os
FFMPEG_VERSION ="5.0.1"
def download_and_extract(file_base_path, name): def download_and_extract(file_base_path, name):
print("Download: ", name) print("Download: ", name)
@ -25,8 +26,8 @@ def download_and_extract(file_base_path, name):
os.remove(path_and_filename) os.remove(path_and_filename)
def download_prebuild_ffmpeg(): def download_prebuild_ffmpeg():
ffmpeg_7zip_name = 'ffmpeg-4.4.zip' ffmpeg_7zip_name = f'ffmpeg-{FFMPEG_VERSION}.zip'
ffprobe_7zip_name = 'ffprobe-4.4.zip' ffprobe_7zip_name = f'ffprobe-{FFMPEG_VERSION}.zip'
current_path = os.path.join(os.path.abspath(os.getcwd()),"") current_path = os.path.join(os.path.abspath(os.getcwd()),"")
extraction_path = os.path.abspath(os.path.join(current_path, "../Common/ffmpeg")) extraction_path = os.path.abspath(os.path.join(current_path, "../Common/ffmpeg"))

6
Tools/setup.py
View File

@ -7,9 +7,7 @@ from pathlib import Path
from execute_util import execute from execute_util import execute
from download_ffmpeg import download_prebuild_ffmpeg from download_ffmpeg import download_prebuild_ffmpeg
vcpkg_version = "2ac61f8" # Master 23.04.2022 vcpkg_version = "98f8d00e89fb6a8019c2045cfa1edbe9d92d3405" # Master 09.07.2022
class commands_list(): class commands_list():
def __init__(self): 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) platform_command.add("pwsh.exe -NoProfile -ExecutionPolicy Bypass .\scripts\\bootstrap.ps1", vcpkg_path)
else: else:
platform_command.add("bootstrap-vcpkg.bat", vcpkg_path, False) 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"] vcpkg_triplet = ["x64-windows"]
elif system() == "Darwin": elif system() == "Darwin":
vcpkg_command = "./vcpkg" vcpkg_command = "./vcpkg"