29 Commits

Author SHA1 Message Date
9c9d5bc9af Update libfdkaac.patch 2023-12-21 12:39:13 +01:00
833f59c056 Update libfdkaac.patch 2023-12-21 11:53:46 +01:00
c6105dcbcd Update ffmpeg.yml 2023-12-21 11:02:23 +01:00
34ba575e93 Update ffmpeg.yml 2023-12-21 11:00:25 +01:00
e8bc575304 Update libfdkaac.patch 2023-12-21 10:45:50 +01:00
778632362f Update ffmpeg.yml 2023-10-29 12:15:42 +01:00
d580fdacf9 Update ffmpeg.yml 2023-10-25 11:04:44 +02:00
fb68a11db0 Update ffmpeg.yml 2023-10-25 10:38:09 +02:00
5c662bbf4c Update ffmpeg.yml 2023-10-25 10:36:21 +02:00
27fe5ace74 Update ffmpeg.yml 2023-10-25 10:06:39 +02:00
5805c7d571 Update ffmpeg-lgpl.yaml 2023-08-19 15:21:35 +02:00
4684230ae5 Update ffmpeg-lgpl.yaml 2023-08-11 10:56:08 +02:00
e7592e5bbd Update ffmpeg-lgpl.yaml 2023-08-11 10:21:42 +02:00
99683552f4 Update ffmpeg.yml 2023-08-08 18:20:35 +02:00
946b581996 Update ffmpeg.yml 2023-08-08 18:11:48 +02:00
717556bb3c Update ffmpeg.yml 2023-08-08 18:10:25 +02:00
9e98f7ba0b Update ffmpeg-lgpl.yaml 2023-06-21 19:29:26 +02:00
fd2416deca Update ffmpeg-lgpl.yaml 2023-06-21 18:59:04 +02:00
70b0e356b5 Update ffmpeg-lgpl.yaml 2023-06-21 16:16:32 +02:00
ec49fc8f45 Update ffmpeg-lgpl.yaml 2023-06-21 14:29:41 +02:00
5b8b185a19 Signing DLLs 2023-06-21 10:04:00 +02:00
e276db8230 Update action.yml 2023-06-15 13:06:05 +02:00
40c5f1b9f4 nvenc headers 2023-06-15 12:55:59 +02:00
0793868642 Removed libvpx 2023-06-15 08:03:42 +02:00
9508b682df Update ffmpeg.yml 2023-04-05 21:41:18 +02:00
4304c8bd21 Update ffmpeg-lgpl.yaml 2023-03-26 11:18:15 +02:00
d642a7af5e Update ffmpeg-lgpl.yaml 2023-03-26 10:57:59 +02:00
15d39a0ae4 Update ffmpeg-lgpl.yaml 2023-03-26 10:45:24 +02:00
41d4be87e1 Update ffmpeg-lgpl.yaml 2023-03-26 10:20:07 +02:00
3 changed files with 21 additions and 11 deletions

View File

@ -30,7 +30,7 @@ runs:
run: | run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist 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 *' 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 ; 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 - name: Publish artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:

View File

@ -66,7 +66,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ./.github/actions/libvpl - uses: ./.github/actions/libvpl
with: with:
refId: master refId: v2023.3.1
config: ${{ inputs.config }} config: ${{ inputs.config }}
#liboggvorbis: #liboggvorbis:
@ -143,6 +143,16 @@ jobs:
with: with:
install: base-devel binutils mingw-w64-x86_64-cmake nasm install: base-devel binutils mingw-w64-x86_64-cmake nasm
path-type: inherit path-type: inherit
- name: Create PFX certificate
id: create-pfx
shell: pwsh
env:
PFX_CONTENT: ${{ secrets.CODESIGN_PFX }}
run: |
$pfxPath = Join-Path -Path $env:RUNNER_TEMP -ChildPath "cert.pfx";
$encodedBytes = [System.Convert]::FromBase64String($env:PFX_CONTENT);
Set-Content $pfxPath -Value $encodedBytes -AsByteStream;
Write-Output "::set-output name=PFX_PATH::$pfxPath";
- name: Set up GIT - name: Set up GIT
run: | run: |
git config --global core.autocrlf false git config --global core.autocrlf false
@ -178,7 +188,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 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 ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; rm -rf cmake pkgconfig *.la ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *' D:\a\_temp\setup-msys2\msys2.cmd -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-cuda ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; rm -rf cmake pkgconfig *.la ; 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:

View File

@ -32,7 +32,7 @@ on:
ffmpegRef: ffmpegRef:
type: string type: string
required: true required: true
default: 'release/6.0' default: 'release/6.1'
description: 'FFmpeg refId' description: 'FFmpeg refId'
workflow_call: workflow_call:
@ -52,7 +52,7 @@ on:
env: env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\ vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvpx --enable-libvorbis --enable-libopus --enable-libx264 --enable-libx265 " COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvorbis --enable-libopus --enable-libvpx --enable-libx264 --enable-libx265 --enable-libfdk-aac"
NASM_EXECUTABLE: nasm NASM_EXECUTABLE: nasm
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }} cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }} variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }}
@ -65,7 +65,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ./.github/actions/libvpl - uses: ./.github/actions/libvpl
with: with:
refId: master refId: v2023.4.0
config: ${{ inputs.config }} config: ${{ inputs.config }}
liboggvorbis: liboggvorbis:
@ -84,7 +84,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ./.github/actions/libsvtav1 - uses: ./.github/actions/libsvtav1
with: with:
refId: v1.4.1 refId: v1.8.0
config: ${{ inputs.config }} config: ${{ inputs.config }}
libsnappy: libsnappy:
@ -93,7 +93,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ./.github/actions/libsnappy - uses: ./.github/actions/libsnappy
with: with:
refId: 1.1.9 refId: 1.1.10
config: ${{ inputs.config }} config: ${{ inputs.config }}
libvpx: libvpx:
@ -102,7 +102,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ./.github/actions/libvpx - uses: ./.github/actions/libvpx
with: with:
refId: v1.13.0 refId: v1.13.1
config: ${{ inputs.config }} config: ${{ inputs.config }}
libmp3lame: libmp3lame:
@ -120,7 +120,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ./.github/actions/libzimg - uses: ./.github/actions/libzimg
with: with:
refId: release-3.0.4 refId: release-3.0.5
config: ${{ inputs.config }} config: ${{ inputs.config }}
libopus: libopus:
@ -129,7 +129,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ./.github/actions/libopus - uses: ./.github/actions/libopus
with: with:
refId: v1.3.1 refId: v1.4
config: ${{ inputs.config }} config: ${{ inputs.config }}
libfdkaac: libfdkaac: