Merge remote-tracking branch 'upstream/master'

natebc · Oct 18, 2023 · 603c0f3 · 603c0f3
2 parents 32db775 + 251dcf3
commit 603c0f3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 89 deletions.
diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml
@@ -90,81 +90,7 @@ jobs:
         run: |
           mkdir Chiaki
           cp build\gui\chiaki.exe Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\avcodec-58.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\avutil-56.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libaom.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libbrotlicommon.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libbrotlidec.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libbz2-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libcairo-2.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libcairo-gobject-2.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libcrypto-1_1-x64.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libdatrie-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libdav1d.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libdouble-conversion.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libexpat-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libffi-7.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libfontconfig-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libfreetype-6.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libfribidi-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libgcc_s_seh-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libgdk_pixbuf-2.0-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libgio-2.0-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libglib-2.0-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libgmodule-2.0-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libgobject-2.0-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libgomp-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libgraphite2.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libgsm.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libharfbuzz-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libiconv-2.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libicudt69.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libicuin69.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libicuuc69.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libintl-8.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\liblzma-5.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libmd4c.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libmfx-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libmp3lame-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libogg-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libopencore-amrnb-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libopencore-amrwb-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libopenjp2-7.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libopus-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libpango-1.0-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libpangocairo-1.0-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libpangoft2-1.0-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libpangowin32-1.0-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libpcre-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libpcre2-16-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libpixman-1-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libpng16-16.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\librsvg-2-2.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libsoxr.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libspeex-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libssl-1_1-x64.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libssp-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libstdc++-6.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libsvtav1enc.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libthai-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libtheoradec-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libtheoraenc-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libvorbis-0.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libvorbisenc-2.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libvpx-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libvulkan-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libwebp-7.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libwebpmux-3.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libwinpthread-1.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libx264-164.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libx265.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libxml2-2.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\libzstd.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\rav1e.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\SDL2.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\swresample-3.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\xvidcore.dll Chiaki
-          cp ${{ runner.temp }}\msys64\mingw64\bin\zlib1.dll Chiaki
+          cp ${{ runner.temp }}\msys64\mingw64\bin\*.dll Chiaki
 
       - name: WindeployQt
         shell: pwsh

diff --git a/.github/workflows/build-visual_studio-qt6.yml b/.github/workflows/build-visual_studio-qt6.yml
@@ -61,17 +61,17 @@ jobs:
       - name: Setup OpenSSL
         run: |
           $ProgressPreference = 'SilentlyContinue'
-          Invoke-WebRequest -UseBasicParsing -Uri "https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1s.zip" -OutFile ".\openssl-1.1.1s.zip"
-          Expand-Archive -LiteralPath "openssl-1.1.1s.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.0.22-VC.zip" -OutFile ".\SDL2-devel-2.0.22-VC.zip"
-          Expand-Archive -LiteralPath "SDL2-devel-2.0.22-VC.zip" -DestinationPath "."
-          Rename-Item "SDL2-2.0.22" "SDL2"
+          Invoke-WebRequest -UseBasicParsing -Uri "https://www.libsdl.org/release/SDL2-devel-2.28.4-VC.zip" -OutFile ".\SDL2-devel-2.28.4-VC.zip"
+          Expand-Archive -LiteralPath "SDL2-devel-2.28.4-VC.zip" -DestinationPath "."
+          Rename-Item "SDL2-2.28.4" "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)'
           Add-Content -Path "${{ github.workspace }}\SDL2\sdl2-config.cmake" -Value 'add_library(${TARGET_NAME} SHARED IMPORTED)'

diff --git a/.github/workflows/build-visual_studio.yml b/.github/workflows/build-visual_studio.yml
@@ -32,9 +32,9 @@ jobs:
       - name: Setup ffmpeg
         run: |
           $ProgressPreference = 'SilentlyContinue'
-          Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n5.0-latest-win64-gpl-shared-5.0.zip" -OutFile ".\ffmpeg-n5.0-latest-win64-gpl-shared-5.0.zip"
-          Expand-Archive -LiteralPath "ffmpeg-n5.0-latest-win64-gpl-shared-5.0.zip" -DestinationPath "."
-          Rename-Item "ffmpeg-n5.0-latest-win64-gpl-shared-5.0" "ffmpeg"
+          Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n5.1-latest-win64-gpl-shared-5.1.zip" -OutFile ".\ffmpeg-n5.1-latest-win64-gpl-shared-5.1.zip"
+          Expand-Archive -LiteralPath "ffmpeg-n5.1-latest-win64-gpl-shared-5.1.zip" -DestinationPath "."
+          Rename-Item "ffmpeg-n5.1-latest-win64-gpl-shared-5.1" "ffmpeg"
           Write-Output "${{ github.workspace }}\ffmpeg" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
 
       - name: Setup Protoc
@@ -50,17 +50,17 @@ jobs:
       - name: Setup OpenSSL
         run: |
           $ProgressPreference = 'SilentlyContinue'
-          Invoke-WebRequest -UseBasicParsing -Uri "https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1p.zip" -OutFile ".\openssl-1.1.1p.zip"
-          Expand-Archive -LiteralPath "openssl-1.1.1p.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.0.22-VC.zip" -OutFile ".\SDL2-devel-2.0.22-VC.zip"
-          Expand-Archive -LiteralPath "SDL2-devel-2.0.22-VC.zip" -DestinationPath "."
-          Rename-Item "SDL2-2.0.22" "SDL2"
+          Invoke-WebRequest -UseBasicParsing -Uri "https://www.libsdl.org/release/SDL2-devel-2.28.4-VC.zip" -OutFile ".\SDL2-devel-2.28.4-VC.zip"
+          Expand-Archive -LiteralPath "SDL2-devel-2.28.4-VC.zip" -DestinationPath "."
+          Rename-Item "SDL2-2.28.4" "SDL2"
           $nix_path = "${{ github.workspace }}" -replace "\\", "/"
           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)'

diff --git a/chiaki b/chiaki