From cf638258b756661b1535a1e52b709946bed2792e Mon Sep 17 00:00:00 2001 From: Daniel Stankewitz Date: Tue, 26 Jul 2022 14:42:33 +0200 Subject: [PATCH] Update ffmpeg.yml --- .github/workflows/ffmpeg.yml | 73 ++++++------------------------------ 1 file changed, 11 insertions(+), 62 deletions(-) diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml index dbf5aa0..e81e765 100644 --- a/.github/workflows/ffmpeg.yml +++ b/.github/workflows/ffmpeg.yml @@ -61,12 +61,11 @@ env: jobs: libvpl: runs-on: ${{ inputs.system }} - if: false steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libvpl with: - refId: '' + refId: master config: ${{ inputs.config }} liboggvorbis: @@ -112,7 +111,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/libmp3lame with: - env: ${{ inputs.env }} + refId: tags/RELEASE__3_100 config: ${{ inputs.config }} libzimg: @@ -121,7 +120,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/libzimg with: - env: ${{ inputs.env }} + refId: release-3.0.4 config: ${{ inputs.config }} libopus: @@ -130,7 +129,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/libopus with: - env: ${{ inputs.env }} + refId: v1.3.1 config: ${{ inputs.config }} libfdkaac: @@ -139,7 +138,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/libfdkaac with: - env: ${{ inputs.env }} + refId: v2.0.2 config: ${{ inputs.config }} libx264: @@ -148,7 +147,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/libx264 with: - env: ${{ inputs.env }} + refId: stable config: ${{ inputs.config }} libx265-12: @@ -157,7 +156,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/libx265-12 with: - env: ${{ inputs.env }} + refId: Release_3.5 config: ${{ inputs.config }} libx265-10: @@ -166,7 +165,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/libx265-10 with: - env: ${{ inputs.env }} + refId: Release_3.5 config: ${{ inputs.config }} libx265: @@ -176,62 +175,13 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/libx265 with: - env: ${{ inputs.env }} + refId: Release_3.5 config: ${{ inputs.config }} - cartwheel: + ffmpeg: runs-on: ${{ inputs.system }} - if: ${{ inputs.source == 'cartwheel' }} needs: [libvpl,libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,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 NvEnc - uses: actions/checkout@v3.0.0 - with: - repository: FFmpeg/nv-codec-headers - ref: master - 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 from Cartwheel - shell: cmd - run: | - call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" - md build dist - 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.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-static-${{ inputs.config }}.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 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 --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-static-${{ inputs.config }}.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 ; 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 --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-gpl --enable-libvpl ${{ 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 *' - - name: Publish artifacts - uses: actions/upload-artifact@v3 - with: - name: FFmpeg (Cartwheel) ${{ inputs.env }} ${{ inputs.config }} package build - path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz - - ffmpeg: - runs-on: ${{ inputs.system }} - if: ${{ inputs.source == 'ffmpeg' }} - needs: [libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx] - steps: - name: Set up MSYS2 uses: msys2/setup-msys2@v2 with: @@ -246,7 +196,6 @@ jobs: - name: Checkout patches uses: actions/checkout@v3.0.0 - name: Checkout FFmpeg - if: ${{ inputs.source == 'ffmpeg' }} uses: actions/checkout@v3.0.0 with: repository: FFmpeg/FFmpeg.git @@ -277,5 +226,5 @@ jobs: - name: Publish FFmpeg artifacts uses: actions/upload-artifact@v3 with: - name: FFmpeg ${{ inputs.env }} ${{ inputs.config }}${{ inputs.config }} package build + name: FFmpeg ${{ inputs.system }} ${{ inputs.config }}${{ inputs.config }} package build path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz