forked from nlz242/chiaki-qt6
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: make mac install ffmpeg 6 and download to right path
- Loading branch information
Showing
1 changed file
with
7 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ jobs: | |
|
|
||
| - name: Install Dependencies | ||
| run: | | ||
| HOMEBREW_NO_AUTO_UPDATE=1 brew install opus [email protected] ffmpeg@5 nasm sdl2 protobuf | ||
| HOMEBREW_NO_AUTO_UPDATE=1 brew install opus [email protected] ffmpeg@6 nasm sdl2 protobuf | ||
| - name: Setup Python | ||
| id: python | ||
|
|
@@ -61,7 +61,7 @@ jobs: | |
| -DCHIAKI_ENABLE_CLI=OFF \ | ||
| -DCHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER=ON \ | ||
| -DPYTHON_EXECUTABLE="${{ env.pythonLocation }}\python" \ | ||
| -DCMAKE_PREFIX_PATH="/usr/local/opt/[email protected];/usr/local/opt/ffmpeg@5;${{ env.Qt6_Dir }}" | ||
| -DCMAKE_PREFIX_PATH="/usr/local/opt/[email protected];/usr/local/opt/ffmpeg@6;${{ env.Qt6_Dir }}" | ||
| - name: Build Chiaki | ||
| working-directory: chiaki-qt6 | ||
|
|
@@ -109,7 +109,7 @@ jobs: | |
| - name: Setup ffmpeg | ||
| run: | | ||
| $ProgressPreference = 'SilentlyContinue' | ||
| Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n6.0-latest-win64-lgpl-shared-6.0.zip" -OutFile ".\ffmpeg-n5.1-latest-win64-lgpl-shared-5.1.zip" | ||
| Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n6.0-latest-win64-lgpl-shared-6.0.zip" -OutFile ".\ffmpeg-n6.0-latest-win64-lgpl-shared-6.0.zip" | ||
| Expand-Archive -LiteralPath "ffmpeg-n6.0-latest-win64-lgpl-shared-6.0.zip" -DestinationPath "." | ||
| Rename-Item "ffmpeg-n6.0-latest-win64-lgpl-shared-6.0.zip" "ffmpeg" | ||
| Write-Output "${{ github.workspace }}\ffmpeg\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append | ||
|
|
@@ -124,16 +124,16 @@ jobs: | |
| - name: Setup OpenSSL | ||
| run: | | ||
| $ProgressPreference = 'SilentlyContinue' | ||
| Invoke-WebRequest -UseBasicParsing -Uri "https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-1.1.1u.zip" -OutFile ".\openssl-1.1.1u.zip" | ||
| Expand-Archive -LiteralPath "openssl-1.1.1u.zip" -DestinationPath "." | ||
| Invoke-WebRequest -UseBasicParsing -Uri "https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-1.1.1w.zip" -OutFile ".\openssl-1.1.1w.zip" | ||
| Expand-Archive -LiteralPath "openssl-1.1.1w.zip" -DestinationPath "." | ||
| Rename-Item "openssl-1.1" "openssl" | ||
| Write-Output "${{ github.workspace }}\openssl" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append | ||
| - name: Setup SDL2 | ||
| run: | | ||
| $ProgressPreference = 'SilentlyContinue' | ||
| Invoke-WebRequest -UseBasicParsing -Uri "https://www.libsdl.org/release/SDL2-devel-2.28.1-VC.zip" -OutFile ".\SDL2-devel-2.28.1-VC.zip" | ||
| Expand-Archive -LiteralPath "SDL2-devel-2.28.1-VC.zip" -DestinationPath "." | ||
| Invoke-WebRequest -UseBasicParsing -Uri "https://www.libsdl.org/release/SDL2-devel-2.28.3-VC.zip" -OutFile ".\SDL2-devel-2.28.3-VC.zip" | ||
| Expand-Archive -LiteralPath "SDL2-devel-2.28.3-VC.zip" -DestinationPath "." | ||
| Rename-Item "SDL2-2.28.1" "SDL2" | ||
| Write-Output "SDL2_DIR=${{ github.workspace }}\SDL2" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append | ||
| Set-Content -Path "${{ github.workspace }}\SDL2\sdl2-config.cmake" -Value 'set(TARGET_NAME SDL2::SDL2)' | ||
|
|
||