Update ffmpeg-static.yml

.github/workflows/ffmpeg-shared.yml

@@ -0,0 +1,399 @@
+name: FFmpeg Shared (v143)
+
+on:
+  workflow_dispatch:
+    inputs:
+      config:
+        type: choice
+        description: Configuration
+        options: 
+        - Debug
+        - Release
+        
+  schedule:
+    - cron: "0 5 * * *"
+        
+env:
+  vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+  switches: "--enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvorbis --enable-libvpx "
+  NASM_EXECUTABLE: nasm
+  msysConfig: release
+  winConfig: Release
+  cFlags: -MD
+  source: "official"
+  
+jobs:
+  liboggvorbis:
+    runs-on: windows-2022
+    steps:
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+    - name: Checkout Ogg
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: xiph/ogg
+        ref: master
+        path: ogg
+    - name: Checkout Vorbis
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: xiph/vorbis
+        ref: master
+        path: vorbis
+    - name: Check cache
+      id: liboggvorbis-cache
+      uses: actions/cache@v3
+      with:
+        path: dist
+        key: liboggvorbis-${{ env.msysConfig }}-${{ hashFiles('ogg') }}-${{ hashFiles('vorbis') }}
+    - name: Set up MSYS2
+      if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake
+        path-type: inherit
+    - name: Build Ogg
+      if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ogg ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install'
+    - name: Build Vorbis
+      if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vorbis ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install ; sed -i '/^Libs\.private.*/d' ../build/lib/pkgconfig/vorbis.pc ; cd ../build ; tar czf ../dist/liboggvorbis.tgz *'
+        echo "switches=${{env.switches}} --enable-encoder=libopus --enable-encoder=libvorbis" >> $GITHUB_ENV
+    - name: Publish artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: liboggvorbis
+        path: dist/liboggvorbis.tgz
+        
+  libvpl:
+    runs-on: windows-2022
+    steps:
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+    - name: Checkout oneVPL
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: oneapi-src/oneVPL
+        ref: master
+        path: onevpl
+    - name: Check cache
+      id: libvpl-cache
+      uses: actions/cache@v3
+      with:
+        path: dist
+        key: libvpl-${{ env.msysConfig }}-${{ hashFiles('onevpl') }}
+    - name: Set up MSYS2
+      if: steps.libvpl-cache.outputs.cache-hit != 'true'
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake
+        path-type: inherit
+    - name: Build oneVPL
+      if: steps.libvpl-cache.outputs.cache-hit != 'true'
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md temp build dist
+        cd temp
+        cmake.exe -G "Visual Studio 17 2022" ..\onevpl -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=..\build -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON
+        MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.winConfig }} -m vpl.sln
+        cd ..\build
+        IF EXIST "lib\vpld.lib" move "lib\vpld.lib" "lib\vpl.lib"
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'rm -rf bin/cmake ; tar czf ../dist/libvpl.tgz *'
+    - name: Publish artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: libvpl
+        path: dist/libvpl.tgz
+        
+  libsvtav1:
+    runs-on: windows-2022
+    steps:
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+    - name: Checkout SVT AV1
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: AOMediaCodec/SVT-AV1
+        ref: master
+        path: svtav1
+    - name: Check cache
+      id: libsvtav1-cache
+      uses: actions/cache@v3
+      with:
+        path: dist
+        key: libsvtav1-${{ env.msysConfig }}-${{ hashFiles('svtav1') }}
+    - name: Set up MSYS2
+      if: steps.libsvtav1-cache.outputs.cache-hit != 'true'
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+        path-type: inherit
+    - name: Build SVT AV1
+      if: steps.libsvtav1-cache.outputs.cache-hit != 'true'
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build build\include build\lib build\lib\pkgconfig dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd svtav1/Build/windows ; ./build.bat 2022 ${{ env.winConfig }} static ; cp -r ../../Source/API ../../../build/include/svt-av1 ; cp ../../Bin/${{ env.msysConfig }}/SvtAv1Enc.lib ../../../build/lib/ ; cp SvtAv1Enc.pc ../../../build/lib/pkgconfig/ ; cd ../../../build ; tar czf ../dist/libsvtav1.tgz *'
+    - name: Publish artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: libsvtav1
+        path: dist/libsvtav1.tgz
+       
+  libsnappy:
+    runs-on: windows-2022
+    steps:
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+    - name: Checkout Snappy
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: google/snappy
+        ref: "1.1.8"
+        path: snappy
+    - name: Check cache
+      id: libsnappy-cache
+      uses: actions/cache@v3
+      with:
+        path: dist
+        key: libsnappy-${{ env.msysConfig }}-${{ hashFiles('snappy') }}
+    - name: Set up MSYS2
+      if: steps.libsnappy-cache.outputs.cache-hit != 'true'
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+        path-type: inherit
+    - name: Build Snappy
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build build\include build\lib build\lib\pkgconfig dist
+        cd snappy
+        md work
+        cd work
+        cmake -G "Visual Studio 17 2022" .. -DCMAKE_INSTALL_PREFIX=..\..\build -DBUILD_SHARED_LIBS=OFF -DSNAPPY_BUILD_TESTS=OFF
+        MSBuild.exe /property:Configuration="${{ env.winConfig }}" Snappy.sln
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cp ${{ env.winConfig }}/snappy.lib ../../build/lib/snappy.lib ; cp ../snappy.h ../snappy-c.h ../../build/include/ ; cd ../../build ; tar czf ../dist/libsnappy.tgz *'
+    - name: Publish artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: libsnappy
+        path: dist/libsnappy.tgz
+
+  libvpx:
+    runs-on: windows-2022
+    steps:
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+        git clone https://github.com/webmproject/libvpx.git vpx
+    - name: Check cache
+      id: libvpx-cache
+      uses: actions/cache@v3
+      with:
+        path: dist
+        key: libvpx-${{ env.msysConfig }}-${{ hashFiles('vpx') }}
+    - name: Set up MSYS2
+      if: steps.libvpx-cache.outputs.cache-hit != 'true'
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+        path-type: inherit
+    - name: Build LibVpx
+      if: steps.libvpx-cache.outputs.cache-hit != 'true'
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build build\include build\lib build\lib\pkgconfig dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vpx ; ./configure --prefix=../build --target=x86_64-win64-vs17 --enable-vp9-highbitdepth --disable-shared --disable-examples --disable-tools --disable-docs --disable-libyuv --disable-unit_tests --disable-postproc ; make -j ; make install ; mv ../build/lib/x64/vpxmd.lib ../build/lib/vpx.lib ; rm -rf ../build/lib/x64 ; cd ../build ; tar czf ../dist/libvpx.tgz *'
+    - name: Publish artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: libvpx
+        path: dist/libvpx.tgz
+
+  libmp3lame:
+    runs-on: windows-2022
+    steps:
+    - name: Set up MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm svn
+        path-type: inherit
+    - name: Build LAME
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'svn co https://svn.code.sf.net/p/lame/svn/trunk/lame@6474 lame ; cd lame ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --enable-nasm --disable-frontend --disable-shared --enable-static ; make -j ; make install ; cd ../build ; tar czf ../dist/libmp3lame.tgz *
+    - name: Publish artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: libmp3lame
+        path: dist/libmp3lame.tgz
+
+  libzimg:
+    runs-on: windows-2022
+    steps:
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+    - name: Checkout ZIMG
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: sekrit-twc/zimg
+        ref: release-2.9.2
+        path: zimg
+    - name: Check cache
+      id: libzimg-cache
+      uses: actions/cache@v3
+      with:
+        path: dist
+        key: libzimg-${{ env.msysConfig }}-${{ hashFiles('zimg') }}
+    - name: Set up MSYS2
+      if: steps.libzimg-cache.outputs.cache-hit != 'true'
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+        path-type: inherit
+    - name: Build ZIMG
+      if: steps.libzimg-cache.outputs.cache-hit != 'true'
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build build\include build\lib build\lib\pkgconfig dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd zimg ; ./autogen.sh ; ./configure --prefix=$(realpath ../build) ; cd _msvc/zimg ; MSBuild.exe /property:Configuration="${{ env.winConfig }}" /property:ConfigurationType=StaticLibrary /property:PlatformToolset=v143 /property:Platform=x64 /property:WholeProgramOptimization=false zimg.vcxproj ; cp x64/${{ env.winConfig }}/z.lib ../../../build/lib/zimg.lib ; cd ../.. ; cp src/zimg/api/zimg.h  ../build/include/zimg.h ; cp zimg.pc ../build/lib/pkgconfig/zimg.pc ; cd ../build ; tar czf ../dist/libzimg.tgz *'
+    - name: Publish artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: libzimg
+        path: dist/libzimg.tgz
+
+  libopus:
+    runs-on: windows-2022
+    steps:
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+    - name: Checkout OPUS
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: xiph/opus
+        ref: master
+        path: opus        
+    - name: Check cache
+      id: libopus-cache
+      uses: actions/cache@v3
+      with:
+        path: dist
+        key: libopus-${{ env.msysConfig }}-${{ hashFiles('opus') }}
+    - name: Set up MSYS2
+      if: steps.libopus-cache.outputs.cache-hit != 'true'
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+        path-type: inherit
+    - name: Build OPUS
+      if: steps.libopus-cache.outputs.cache-hit != 'true'
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build build\include build\lib build\lib\pkgconfig dist
+        cd opus\win32\VS2015
+        MSBuild.exe /property:Configuration="${{ env.winConfig }}" /property:Platform=x64 /property:PlatformToolset=v143 opus.vcxproj
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cp x64/${{ env.winConfig }}/opus.lib ../../../build/lib/opus.lib ; cd ../../.. ; cp -r opus/include build/include/opus ; cp opus/opus.pc.in build/lib/pkgconfig/opus.pc ; sed -i "s#@prefix@#$(realpath ../../../build)#g" build/lib/pkgconfig/opus.pc ; sed -i "s/@exec_prefix@/\$\{prefix\}/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@libdir@/\$\{prefix\}\/lib/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@includedir@/\$\{prefix\}\/include/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@LIBM@//g" build/lib/pkgconfig/opus.pc; sed -i "s/@VERSION@/2.0.0/g" build/lib/pkgconfig/opus.pc ; cd build ; tar czf ../dist/libopus.tgz *'
+    - name: Publish artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: libopus
+        path: dist/libopus.tgz
+
+  ffmpeg:
+    runs-on: windows-2022
+    needs: [libopus,libvpl,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libvpx]
+    steps:
+    - name: Set up MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils mingw-w64-x86_64-cmake nasm
+        path-type: inherit
+
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+        git config --global user.email "daniel.stankewitz@gmail.com"
+        git config --global user.name "Daniel Stankewitz"
+
+    - name: Checkout patches
+      uses: actions/checkout@v3.0.0
+
+    - name: Checkout FFmpeg
+      if: ${{env.source == 'official'}}
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: FFmpeg/FFmpeg.git
+        ref: release/5.0
+        path: ffmpeg
+    
+    - name: Checkout NvEnc
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: FFmpeg/nv-codec-headers
+        ref: sdk/9.1
+        path: nvenc
+    
+    - name: Checkout AMF
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: GPUOpen-LibrariesAndSDKs/AMF
+        ref: master
+        path: amf
+    
+    - name: Set up artifacts
+      uses: actions/download-artifact@v3
+      with:
+        path: build_artifacts
+    
+    - name: Build FFmpeg
+      if: ${{env.source == 'official'}}
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --pkg-config-flags="--static" --build-suffix=-voukoderpro --disable-doc --disable-static --enable-shared --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../build ; dir ; tar czf ../dist/ffmpeg-win64-shared-${{ env.msysConfig }}.tar.gz *'
+
+    - name: Build FFmpeg from Cartwheel
+      if: ${{env.source == 'cartwheel'}}
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; cd patches ; git apply --ignore-whitespace ../../hotfix.patch ; cd .. ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --build-suffix=-voukoderpro --extra-libs=Advapi32.lib --disable-doc --disable-static --enable-shared --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../../build ; dir ; tar czf ../dist/ffmpeg-win64-shared-${{ env.msysConfig }}.tar.gz *'
+
+    - name: Publish FFmpeg artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ env.winConfig }} package build
+        path: dist/ffmpeg-win64-shared-${{ env.msysConfig }}.tar.gz

.github/workflows/ffmpeg-static.yml

@@ -1,4 +1,4 @@
-name: FFmpeg (v143)
+name: FFmpeg Static (v143)
 
 on:
   workflow_dispatch:
@@ -11,15 +11,15 @@ on:
         - Release
         
   schedule:
-    - cron: "0 5 * * 1"
+    - cron: "0 5 * * *"
         
 env:
   vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
-  switches: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac"
+  switches: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvpx "
   NASM_EXECUTABLE: nasm
-  msysConfig: debug
+  msysConfig: release
-  winConfig: Debug
+  winConfig: Release
-  cFlags: -MDd
+  cFlags: -MD
   useCartwheel: true
   
 jobs:
@@ -108,7 +108,7 @@ jobs:
         md temp build dist
         cd temp
         cmake.exe -G "Visual Studio 17 2022" ..\onevpl -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=..\build -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON
-        MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.winConfig }} -m oneVPL.sln
+        MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.winConfig }} -m vpl.sln
         cd ..\build
         IF EXIST "lib\vpld.lib" move "lib\vpld.lib" "lib\vpl.lib"
         D:\a\_temp\setup-msys2\msys2.cmd -c 'rm -rf bin/cmake ; tar czf ../dist/libvpl.tgz *'
@@ -239,19 +239,12 @@ jobs:
       with:
         install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm svn
         path-type: inherit
-    - name: Set up cache
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-ffmpeg-${{ env.msysConfig }}
-      with:
-        path: cache
-        key: cache-key
     - name: Build LAME
       shell: cmd
       run: |
         call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
         md build dist
-        D:\a\_temp\setup-msys2\msys2.cmd -c 'svn co svn://svn.code.sf.net/p/lame/svn/trunk/lame@6474 lame ; cd lame ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --enable-nasm --disable-frontend --disable-shared --enable-static ; make -j ; make install ; cd ../build ; tar czf ../dist/libmp3lame.tgz *
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'svn co https://svn.code.sf.net/p/lame/svn/trunk/lame@6474 lame ; cd lame ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --enable-nasm --disable-frontend --disable-shared --enable-static ; make -j ; make install ; cd ../build ; tar czf ../dist/libmp3lame.tgz *
     - name: Publish artifact
       uses: actions/upload-artifact@v2
       with:
@@ -549,7 +542,7 @@ jobs:
 
   ffmpeg:
     runs-on: windows-2022
-    needs: [libopus,libvpl,libsvtav1,libsnappy,libmp3lame,libzimg,libvpx,liboggvorbis,libx264,libx265,libfdkaac]
+    needs: [libopus,libvpl,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
     steps:
     - name: Set up MSYS2
       uses: msys2/setup-msys2@v2
@@ -600,7 +593,8 @@ jobs:
       run: |
         call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
         md build dist
-        D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
+        rem D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout b3f9843cffd4118e35bb000779444ca2f4196342 ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout 2757a1d43ca83a3762b24a7ddd74b3291873f89c ; cd patches ; git apply --ignore-whitespace ../../hotfix.patch ; cd .. ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
     - name: Publish FFmpeg artifacts
       uses: actions/upload-artifact@v3
       with:

hotfix.patch

@@ -0,0 +1,20 @@
+diff --git a/ffmpeg b/ffmpeg
+index 3721aae..336fe22 160000
+--- a/ffmpeg
++++ b/ffmpeg
+@@ -1 +1 @@
+-Subproject commit 3721aaeaaae9f817abb843117ae8dae1dc280a7f
++Subproject commit 336fe225a6a0e12d2ba701c641df63d36151f6fb-dirty
+diff --git a/patches/0075-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch b/patches/0075-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch
+index d1a787a..6a53eb0 100644
+--- a/patches/0075-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch
++++ b/patches/0075-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch
+@@ -908,7 +908,7 @@ index 1e8ac56eed..500cf4c0bc 100644
+ +            break;
+ +        else if (sts != MFX_ERR_NONE) {
+ +            impl_idx++;
+-+            continue;
+++            break;
+ +        }
+ +
+ +        sts = MFXCreateSession(loader, impl_idx, &session);