Update ffmpeg.yml

This commit is contained in:
Daniel Stankewitz 2023-02-18 14:30:00 +01:00 committed by GitHub
parent 270c6fce9c
commit 46ef28c470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -69,15 +69,15 @@ jobs:
refId: master refId: master
config: ${{ inputs.config }} config: ${{ inputs.config }}
liboggvorbis: #liboggvorbis:
runs-on: ${{ inputs.system }} # runs-on: ${{ inputs.system }}
steps: # steps:
- uses: actions/checkout@v3 # - uses: actions/checkout@v3
- uses: ./.github/actions/liboggvorbis # - uses: ./.github/actions/liboggvorbis
with: # with:
libogg_refId: v1.3.5 # libogg_refId: v1.3.5
libvorbis_refId: v1.3.7 # libvorbis_refId: v1.3.7
config: ${{ inputs.config }} # config: ${{ inputs.config }}
libsvtav1: libsvtav1:
runs-on: ${{ inputs.system }} runs-on: ${{ inputs.system }}
@ -223,7 +223,7 @@ jobs:
run: | run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace ../amd-av1-amf.patch ; git apply --ignore-whitespace ../nvidia-av1-nvenc.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 ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; 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-${{ inputs.type }}-${{ inputs.config }}.tar.gz *' D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace ../amd-av1-amf.patch ; git apply --ignore-whitespace ../nvidia-av1-nvenc.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 ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; exit 0 ; make -j 2 ; 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-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
- name: Publish FFmpeg artifacts - name: Publish FFmpeg artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with: