diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml index ac8f489..edb0f3a 100644 --- a/.github/workflows/ffmpeg.yml +++ b/.github/workflows/ffmpeg.yml @@ -18,6 +18,7 @@ env: jobs: liboggvorbis: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -68,6 +69,7 @@ jobs: path: dist/liboggvorbis.tgz libvpl: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -108,6 +110,7 @@ jobs: path: dist/libvpl.tgz libsvtav1: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -145,6 +148,7 @@ jobs: path: dist/libsvtav1.tgz libsnappy: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -187,6 +191,7 @@ jobs: path: dist/libsnappy.tgz libvpx: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -224,6 +229,7 @@ jobs: path: dist/libvpx.tgz libmp3lame: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -251,6 +257,7 @@ jobs: path: dist/libmp3lame.tgz libzimg: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -288,6 +295,7 @@ jobs: path: dist/libzimg.tgz libopus: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -327,6 +335,7 @@ jobs: path: dist/libopus.tgz libx264: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -364,6 +373,7 @@ jobs: path: dist/libx264.tgz libfdkaac: + if: ${{ false }} runs-on: windows-2019 steps: - name: Set up MSYS2 @@ -402,7 +412,7 @@ jobs: ffmpeg: runs-on: windows-2019 - needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,libopus,liboggvorbis,libx264,libfdkaac] + #needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,libopus,liboggvorbis,libx264,libfdkaac] steps: - name: Set up MSYS2 uses: msys2/setup-msys2@v2 @@ -421,16 +431,16 @@ jobs: 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 + # 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: Checkout patches uses: actions/checkout@v3.0.0 with: @@ -443,7 +453,7 @@ jobs: shell: cmd run: | call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" - D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply ../patches/0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; cd ..' || true + D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --verbose ../patches/0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; cd ..' || true md build dist D:\a\_temp\setup-msys2\msys2.cmd -c 'cd build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm 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" --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 ; ls -laR .. ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; ls -laR .. ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *' - name: Publish FFmpeg artifacts