Update ffmpeg.yml

This commit is contained in:
Daniel Stankewitz 2022-03-25 12:21:10 +01:00 committed by GitHub
parent 06a2f9ee63
commit b2b694a10d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,7 +13,7 @@ env:
msysConfig: debug msysConfig: debug
winConfig: Debug winConfig: Debug
cFlags: -MDd cFlags: -MDd
switches: "--enable-encoder=libvpl --enable-encoder=libsvtav1 --enable-encoder=libsnappy --enable-encoder=libvpx --enable-encoder=libmp3lame --enable-encoder=libzimg --enable-encoder=libopus --enable-encoder=libogg --enable-encoder=libvorbis --enable-encoder=libx264 --enable-encoder=libfdk-aac" switches: "--enable-encoder=libvpl --enable-encoder=libsvtav1 --enable-encoder=libsnappy --enable-encoder=libvpx --enable-encoder=libmp3lame --enable-encoder=libzimg --enable-encoder=libopus --enable-encoder=libogg --enable-encoder=libvorbis --enable-encoder=libx264 --enable-encoder=libx265 --enable-encoder=libfdk-aac"
NASM_EXECUTABLE: nasm NASM_EXECUTABLE: nasm
jobs: jobs:
@ -464,6 +464,11 @@ jobs:
runs-on: windows-2019 runs-on: windows-2019
needs: [libx265-12,libx265-10] needs: [libx265-12,libx265-10]
steps: steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake
path-type: inherit
- name: Set up MSBuild - name: Set up MSBuild
uses: microsoft/setup-msbuild@v1.1 uses: microsoft/setup-msbuild@v1.1
- name: Set up NASM - name: Set up NASM
@ -482,23 +487,25 @@ jobs:
shell: cmd shell: cmd
run: | run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md dist md dist dist\include dist\lib dist\lib\pkgconfig
cd x265/build/vc15-x86_64 cd x265/build/vc15-x86_64
md work md work
cd work cd work
cmake -G "Visual Studio 16 2019" ..\..\..\source -DCMAKE_INSTALL_PREFIX=..\..\..\..\build -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DEXTRA_LIB="libx265_10bit.lib;libx265_12bit.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON cmake -G "Visual Studio 16 2019" ..\..\..\source -DCMAKE_INSTALL_PREFIX=..\..\..\..\build -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DEXTRA_LIB="libx265_10bit.lib;libx265_12bit.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON
MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265-static.vcxproj MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265-static.vcxproj
LIB.EXE /ignore:4006 /ignore:4221 /OUT:..\..\..\..\dist\x265.lib ${{ env.winConfig }}\x265-static.lib ..\..\..\..\build\libx265_10bit.lib ..\..\..\..\build\libx265_12bit.lib cp x265.pc ..\..\..\..\dist\lib\pkgconfig\x265.pc
cp x265.pc ..\..\..\..\build\lib\pkgconfig\x265.pc move ${{ env.winConfig }}\x265-static.lib ..\..\..\..\build\
cp x265_config.h ..\..\..\..\build\include move x265_config.h ..\..\..\..\dist\include\
cp ..\..\..\source\x265.h ..\..\..\..\build\lib\include cd ..\..\..\..
cd ..\..\..\..\build "${{ env.vsPath }}VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\lib.exe" /ignore:4006 /ignore:4221 /OUT:dist\lib\x265.lib build\x265-static.lib build\x265_10bit\x265_10bit.lib build\x265_12bit\x265_12bit.lib
rem tgz copy x265\source\x265.h dist\include\
dir /s dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd dist ; tar czf ../libx265.tgz *'
- name: Publish artifact - name: Publish artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: x265 name: libx265
path: dist/x265.lib path: libx265.tgz
ffmpeg: ffmpeg:
runs-on: windows-2019 runs-on: windows-2019