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

Update Qt and ffmpeg

Browse Source
This commit is contained in:
Elias Steurer 2024-05-21 13:54:10 +02:00
parent 99b0647f81
commit 7dcaa3b016
9 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/ci/base_jobs.yml
View File

@ -35,7 +35,7 @@
- cd ..
- git clone https://invent.kde.org/plasma/layer-shell-qt.git
- cd layer-shell-qt
- cmake configure . -DCMAKE_PREFIX_PATH="./../../../aqt/6.7.0/gcc_64"
- cmake configure . -DCMAKE_PREFIX_PATH="./../../../aqt/6.7.1/gcc_64"
- make
- make install
- cd ..

2
.vscode/launch.json vendored
View File

@ -17,7 +17,7 @@
"environment": [
{
"name": "Path",
"value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.7.0\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.7.0\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.7.0\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
"value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.7.1\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.7.1\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.7.1\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
}
],
"visualizerFile": "${workspaceFolder}/.vscode/qt.natvis.xml"

2
CMake/Platform/Linux/CMakePresets.json
View File

@ -18,7 +18,7 @@
"host-linux"
],
"cacheVariables": {
"CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.0/gcc_64",
"CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.1/gcc_64",
"VCPKG_TARGET_TRIPLET": "x64-linux"
}
},

2
CMake/Platform/Mac/CMakePresets.json
View File

@ -18,7 +18,7 @@
"host-mac"
],
"cacheVariables": {
"CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.0/macos",
"CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.1/macos",
"VCPKG_OSX_ARCHITECTURES": "arm64;x86_64",
"VCPKG_TARGET_TRIPLET": "64-osx-universal"
}

4
CMake/Platform/Windows/CMakePresets.json
View File

@ -36,7 +36,7 @@
"windows-base"
],
"cacheVariables": {
"CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.0/msvc2019_64"
"CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.1/msvc2019_64"
}
},
{
@ -77,7 +77,7 @@
},
{
"name": "windows-clang-base",
"inherits": "windows-base",
"inherits": "windows-base-aqt",
"cacheVariables": {
"CMAKE_C_COMPILER": "C:/Program Files/LLVM/bin/clang-cl.exe",
"CMAKE_CXX_COMPILER": "C:/Program Files/LLVM/bin/clang-cl.exe"

4
Tools/build_godot.py
View File

@ -12,7 +12,7 @@ import argparse
def main():
# Parse build folder as arugment
parser = argparse.ArgumentParser(description='Build K3000Map to the bin build folder: D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.0_MSVC_Debug/bin')
parser = argparse.ArgumentParser(description='Build K3000Map to the bin build folder: D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.1_MSVC_Debug/bin')
parser.add_argument('--build_path', dest="build_path", type=str, help='Build folder')
parser.add_argument('--skip_if_exists', dest="skip_if_exists", default=False, action="store_true", help='Skips the build if the index.html file exists. This is used for faster CMake configure')
@ -20,7 +20,7 @@ def main():
if not args.build_path:
print("ERROR: Please specify the build folder")
print("py build_godot.py --build_path D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.0_MSVC_Debug/bin/")
print("py build_godot.py --build_path D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.1_MSVC_Debug/bin/")
exit()
# if build path exists and contains a index.html file, skip the build

5
Tools/defines.py
View File

@ -21,7 +21,7 @@ elif sys.platform == "linux":
REPO_PATH = Path(__file__, "../../").resolve()
THIRDPATH_PATH = Path(REPO_PATH, "ThirdParty").resolve()
QT_PATH = path = Path(REPO_PATH, "../aqt").resolve()
QT_VERSION = "6.7.0"
QT_VERSION = "6.7.1"
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
QT_IFW_VERSION = "4.6"
@ -35,7 +35,8 @@ VCPKG_BASE_PACKAGES = [
"catch2"
]
PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
FFMPEG_VERSION = "6.1"
FFMPEG_VERSION_MAC = "6.1.1"
FFMPEG_VERSION_WIN = "7.0"
GODOT_VERSION = "4.2.1"
GODOT_RELEASE_TYPE = "stable"
GODOT_DOWNLOAD_SERVER = "https://github.com/godotengine/godot-builds/releases/download"

15
Tools/download_ffmpeg.py
View File

@ -11,7 +11,7 @@ import defines
from shutil import move, rmtree
from util import cd_repo_root_path
from sys import stdout
from defines import FFMPEG_VERSION
from defines import FFMPEG_VERSION_MAC, FFMPEG_VERSION_WIN
stdout.reconfigure(encoding='utf-8')
@ -78,8 +78,8 @@ def extract_zip_executables(extraction_path, path_and_filename):
def download_prebuild_ffmpeg_mac(extraction_path: str):
print("Setup ffmpeg mac")
ffmpeg_zip_name = f'ffmpeg-{defines.FFMPEG_VERSION}.zip'
ffprobe_zip_name = f'ffprobe-{defines.FFMPEG_VERSION}.zip'
ffmpeg_zip_name = f'ffmpeg-{defines.FFMPEG_VERSION_MAC}.zip'
ffprobe_zip_name = f'ffprobe-{defines.FFMPEG_VERSION_MAC}.zip'
download_server_base_url = 'https://evermeet.cx/ffmpeg/'
ffmpeg_path_and_filename = download(
@ -118,9 +118,16 @@ def execute() ->bool:
version_line = next((line for line in output.split('\n') if 'ffmpeg version' in line), None)
if version_line:
installed_version = version_line.split(' ')[2].split('-')[0]
if installed_version == FFMPEG_VERSION:
if sys.platform == "win32":
if installed_version == FFMPEG_VERSION_WIN:
print(f"FFmpeg version {installed_version} is already installed.")
return True
elif platform.system() == "Darwin":
if installed_version == FFMPEG_VERSION_MAC:
print(f"FFmpeg version {installed_version} is already installed.")
return True
else:
print(f"FFmpeg version {installed_version} found, but version {FFMPEG_VERSION} is required.")

4
Tools/setup.py
View File

@ -57,8 +57,8 @@ def download(aqt_path: Path, qt_platform: Path):
os = "linux"
qt_packages += "qt3d qtquick3d qtconnectivity qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning"
# Windows: python -m aqt list-qt windows desktop --modules 6.7.0 win64_msvc2019_64
# Linux: python3 -m aqt list-qt linux desktop --modules 6.7.0 gcc_64
# Windows: python -m aqt list-qt windows desktop --modules 6.7.1 win64_msvc2019_64
# Linux: python3 -m aqt list-qt linux desktop --modules 6.7.1 gcc_64
print(f"Downloading: {qt_packages} to {aqt_path}")
execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-qt -O {aqt_path} {os} desktop {defines.QT_VERSION} {qt_platform} -m {qt_packages}")