1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-03 00:59:47 +02:00

Add ffmpeg as dev direct download

This commit is contained in:
Elias Steurer 2020-09-18 12:22:42 +02:00
parent d850a05aa8
commit 8b3040180a
4 changed files with 38 additions and 11 deletions

1
.gitignore vendored
View File

@ -88,3 +88,4 @@ compile_commands.json
CTestTestfile.cmake
_deps
.cmake/**
/Common/ffmpeg/*

View File

@ -4,7 +4,7 @@
``` bash
git clone --recursive https://gitlab.com/kelteseth/ScreenPlay.git
```
3. Download the latest [__Qt 5.14__](https://www.qt.io/download-qt-installer). Earlier versions are not supported!
3. Download the latest [__Qt 5.15__](https://www.qt.io/download-qt-installer). Earlier versions are not supported!
4. Start install-dependencies.bat to download dependencies into the Common/ folder
``` bash
//Windows
@ -16,15 +16,11 @@ chmod +x install-dependencies.sh
.\install-dependencies.sh
```
* This will install these dependencies via __vcpkg__
* libzippp
* nlohmann-json
* openSSL 1.1.1d
* zlib& libzip
* breakpad
* sentry-native
* Download these dependencies via __git submodules__
* stomt-qt-sdk
* qt-google-analytics
* qt-breakpad
* Download ffmpeg binaries
5. **Follow the steps below for your OS**.
6. Open the CMakeLists.txt via QtCreator. **This can take some time until QtCreator parses all files!**
@ -52,7 +48,7 @@ chmod +x install-dependencies.sh
2. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool
- Select the following features to install:
- Qt 5.14.2
- Qt 5.15.2
- MSVC 2017 64-bit
- Qt WebEngine
- Developer and Designer Tools
@ -75,14 +71,14 @@ sudo zypper install -t pattern devel_basis
2. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool
- Select the following features to install:
- Qt 5.14.2
- Qt 5.15.2
- GCC
- Qt WebEngine
### OSX
1. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool
- Select the following features to install:
- Qt 5.14.2
- Qt 5.15.2
- Qt WebEngine
- Developer and Designer Tools
- OpenSSL 1.1.1.c Toolkit

View File

@ -112,3 +112,13 @@ target_include_directories(${PROJECT_NAME}
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/assets/fonts)
configure_file(assets/fonts/NotoSansCJKkr-Regular.otf ${CMAKE_BINARY_DIR}/bin/assets/fonts COPYONLY)
# Copy ffmpeg. If the ffmpeg files are missing, start the
# install_dependencies_XXX for your system!
if(WIN32)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../Common/ffmpeg/ffmpeg.exe ${CMAKE_BINARY_DIR}/bin/ COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../Common/ffmpeg/ffprobe.exe ${CMAKE_BINARY_DIR}/bin/ COPYONLY)
else()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../Common/ffmpeg/ffmpeg ${CMAKE_BINARY_DIR}/bin/ COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../Common/ffmpeg/ffprobe ${CMAKE_BINARY_DIR}/bin/ COPYONLY)
endif()

View File

@ -7,4 +7,24 @@ git pull
rem master 10.09.2020 - 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
git checkout 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
call bootstrap-vcpkg.bat
vcpkg.exe install zlib libzip libzippp openssl breakpad ffmpeg[gpl,x264,vpx,mp3lame,opus] --triplet x64-windows --recurse
rem Install vcpkg dependencies
vcpkg.exe install openssl --triplet x64-windows --recurse
rem Donwload ffmpeg
curl.exe -L https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full.zip --output ffmpeg.zip
rem Extract ffmpeg. Needs Windows 10 build 17063 or higher!
rem We only need the content of the bin folder
rem --strip-components 2 removes folder
tar -xvf ffmpeg.zip --strip-components 2 ffmpeg-4.3.1-full_build/bin
rem Create ffmpeg folder
mkdir Common/ffmpeg
rem Remove not used ffplay
rm ffplay.exe
rem Move ffmpeg into folder
mv ffmpeg.exe Common/ffmpeg
mv ffprobe.exe Common/ffmpeg