From 041514f82c9dfc2fd959179057ae6dd5fc6a35e6 Mon Sep 17 00:00:00 2001 From: dilesoft Date: Mon, 15 Jan 2024 10:55:09 +0300 Subject: [PATCH 1/4] actions ffmpeg fix --- .github/workflows/vangers_macos_build.yml | 2 +- .github/workflows/vangers_windows_32_build.yml | 8 ++++---- .github/workflows/vangers_windows_64_build.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/vangers_macos_build.yml b/.github/workflows/vangers_macos_build.yml index 00920ac..9243cb6 100644 --- a/.github/workflows/vangers_macos_build.yml +++ b/.github/workflows/vangers_macos_build.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: actions/checkout@v2 # - name: update repos diff --git a/.github/workflows/vangers_windows_32_build.yml b/.github/workflows/vangers_windows_32_build.yml index d65dbb8..9665687 100644 --- a/.github/workflows/vangers_windows_32_build.yml +++ b/.github/workflows/vangers_windows_32_build.yml @@ -34,7 +34,7 @@ jobs: msys2 -c 'ninja install' working-directory: clunk/build - name: ffmpeg -- download - run: git clone --depth 1 --branch n4.2.2 https://git.ffmpeg.org/ffmpeg.git ffmpeg + run: git clone --depth 1 --branch release/6.0 https://git.ffmpeg.org/ffmpeg.git ffmpeg - name: ffmpeg -- configure run: msys2 -c './configure --enable-shared --prefix=/mingw32 --disable-everything @@ -77,9 +77,9 @@ jobs: msys2 -c 'mkdir -p vangers/bin' msys2 -c 'cp /mingw32/bin/SDL2.dll vangers/bin/' msys2 -c 'cp /mingw32/bin/SDL2_net.dll vangers/bin/' - msys2 -c 'cp /mingw32/bin/avcodec-58.dll vangers/bin/' - msys2 -c 'cp /mingw32/bin/avformat-58.dll vangers/bin/' - msys2 -c 'cp /mingw32/bin/avutil-56.dll vangers/bin/' + msys2 -c 'cp /mingw32/bin/avcodec-60.dll vangers/bin/' + msys2 -c 'cp /mingw32/bin/avformat-60.dll vangers/bin/' + msys2 -c 'cp /mingw32/bin/avutil-58.dll vangers/bin/' msys2 -c 'cp /mingw32/bin/libogg-0.dll vangers/bin/' msys2 -c 'cp /mingw32/bin/libvorbis-0.dll vangers/bin/' msys2 -c 'cp /mingw32/bin/libvorbisfile-3.dll vangers/bin/' diff --git a/.github/workflows/vangers_windows_64_build.yml b/.github/workflows/vangers_windows_64_build.yml index 64a7937..dbd766e 100644 --- a/.github/workflows/vangers_windows_64_build.yml +++ b/.github/workflows/vangers_windows_64_build.yml @@ -34,7 +34,7 @@ jobs: msys2 -c 'ninja install' working-directory: clunk/build - name: ffmpeg -- download - run: git clone --depth 1 --branch n4.2.2 https://git.ffmpeg.org/ffmpeg.git ffmpeg + run: git clone --depth 1 --branch release/6.0 https://git.ffmpeg.org/ffmpeg.git ffmpeg - name: ffmpeg -- configure run: msys2 -c './configure --enable-shared --prefix=/mingw64 --disable-everything @@ -77,9 +77,9 @@ jobs: msys2 -c 'mkdir -p vangers/bin' msys2 -c 'cp /mingw64/bin/SDL2.dll vangers/bin/' msys2 -c 'cp /mingw64/bin/SDL2_net.dll vangers/bin/' - msys2 -c 'cp /mingw64/bin/avcodec-58.dll vangers/bin/' - msys2 -c 'cp /mingw64/bin/avformat-58.dll vangers/bin/' - msys2 -c 'cp /mingw64/bin/avutil-56.dll vangers/bin/' + msys2 -c 'cp /mingw64/bin/avcodec-60.dll vangers/bin/' + msys2 -c 'cp /mingw64/bin/avformat-60.dll vangers/bin/' + msys2 -c 'cp /mingw64/bin/avutil-58.dll vangers/bin/' msys2 -c 'cp /mingw64/bin/libogg-0.dll vangers/bin/' msys2 -c 'cp /mingw64/bin/libvorbis-0.dll vangers/bin/' msys2 -c 'cp /mingw64/bin/libvorbisfile-3.dll vangers/bin/' From 4e2eca7dc41230bc666b94f773b54168baa944a6 Mon Sep 17 00:00:00 2001 From: dilesoft Date: Mon, 15 Jan 2024 11:01:50 +0300 Subject: [PATCH 2/4] actions ffmpeg fix --- .github/workflows/vangers_windows_32_build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/vangers_windows_32_build.yml b/.github/workflows/vangers_windows_32_build.yml index 9665687..ee9f0fb 100644 --- a/.github/workflows/vangers_windows_32_build.yml +++ b/.github/workflows/vangers_windows_32_build.yml @@ -47,7 +47,14 @@ jobs: --disable-d3d11va --disable-dxva2 --disable-doc --disable-ffplay --disable-ffprobe --disable-ffmpeg - --disable-static --disable-bzlib --disable-libopenjpeg --disable-iconv' + --disable-static --disable-bzlib --disable-libopenjpeg --disable-iconv + --disable-lto + --disable-avx + --disable-avx2 + --disable-avx512 + --disable-fma4 + --disable-fma3 + --disable-inline-asm' working-directory: ffmpeg - name: ffmpeg -- build and install run: | From 66ce4255a84e66bbb889ee048057b3ec35380462 Mon Sep 17 00:00:00 2001 From: dilesoft Date: Mon, 15 Jan 2024 11:13:02 +0300 Subject: [PATCH 3/4] actions ffmpeg fix --- cmake/FindFFMPEG.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/FindFFMPEG.cmake b/cmake/FindFFMPEG.cmake index bbf676d..7b13799 100644 --- a/cmake/FindFFMPEG.cmake +++ b/cmake/FindFFMPEG.cmake @@ -80,6 +80,7 @@ FIND_LIBRARY(AVUTIL_LIBRARY avutil avutil-55 avutil-56 + avutil-58 PATHS /usr/local/lib /usr/pkg/lib/ffmpeg3 @@ -101,6 +102,7 @@ FIND_LIBRARY(AVCODEC_LIBRARY avcodec avcodec-57 avcodec-58 + avcodec-60 PATHS /usr/local/lib /usr/pkg/lib/ffmpeg3 @@ -121,6 +123,7 @@ FIND_LIBRARY(AVFORMAT_LIBRARY avformat avformat-57 avformat-58 + avformat-60 PATHS /usr/local/lib /usr/pkg/lib/ffmpeg3 From b8d05a073776ed684408267d380f69e3614c1cde Mon Sep 17 00:00:00 2001 From: dilesoft Date: Mon, 15 Jan 2024 11:18:30 +0300 Subject: [PATCH 4/4] actions ffmpeg fix --- .github/workflows/vangers_macos_build.yml | 24 ++++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/vangers_macos_build.yml b/.github/workflows/vangers_macos_build.yml index 9243cb6..34a9934 100644 --- a/.github/workflows/vangers_macos_build.yml +++ b/.github/workflows/vangers_macos_build.yml @@ -1,6 +1,8 @@ name: Vangers MacOS Build on: [push, pull_request] +env: + MACOSX_DEPLOYMENT_TARGET: 11 jobs: build: @@ -16,11 +18,12 @@ jobs: brew install ninja yasm dylibbundler - name: install our libs run: | - brew reinstall -s ./formulas/libsndfile.rb - brew reinstall -s ./formulas/libogg.rb - brew reinstall -s ./formulas/libvorbis.rb - brew install -s ./formulas/sdl2.rb - brew install -s ./formulas/sdl2_net.rb + # brew reinstall -s ./formulas/libsndfile.rb --force --verbose --debug + # brew reinstall -s ./formulas/libogg.rb --force --verbose --debug + # brew reinstall -s ./formulas/libvorbis.rb --force --verbose --debug + # brew install -s ./formulas/sdl2.rb --force --verbose --debug + # brew install -s ./formulas/sdl2_net.rb --force --verbose --debug + brew install sdl2 sdl2_net libvorbis libogg libsndfile - name: clunk -- download lib run: git clone --depth 1 https://github.com/stalkerg/clunk.git clunk - name: clunk -- create build dir @@ -36,7 +39,7 @@ jobs: run: ./configure --enable-shared --prefix=/usr/local --cc=clang --arch=x86_64 - --cpu=ivybridge + --cpu=westmere --disable-everything --enable-swscale --enable-zlib @@ -46,27 +49,20 @@ jobs: --enable-protocol=file --disable-d3d11va --disable-dxva2 + --disable-avx --disable-doc --disable-ffplay --disable-ffprobe --disable-ffmpeg --disable-static --disable-bzlib --disable-libopenjpeg --disable-iconv working-directory: ffmpeg - env: - MACOSX_DEPLOYMENT_TARGET: 10.12 - name: ffmpeg -- build and install run: | make -j4 sudo make install working-directory: ffmpeg - env: - MACOSX_DEPLOYMENT_TARGET: 10.12 - name: configure run: mkdir build && cd build && cmake -G Ninja .. - env: - MACOSX_DEPLOYMENT_TARGET: 10.12 - name: make run: ninja working-directory: build - env: - MACOSX_DEPLOYMENT_TARGET: 10.12 - name: vangers -- prepare release folder run: | mkdir Vangers.app/Contents/Frameworks