Merge pull request #633 from DileSoft/actions_ffmpeg_fix

actions ffmpeg fix

.github/workflows/vangers_macos_build.yml

@@ -1,10 +1,12 @@
 name: Vangers MacOS Build
 
 on: [push, pull_request]
+env:
+  MACOSX_DEPLOYMENT_TARGET: 11
 
 jobs:
   build:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
     - uses: actions/checkout@v2
     # - name: update repos
@@ -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

.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
@@ -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: |
@@ -77,9 +84,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/'

.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/'

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