From 3916f5661ed15df76e3ecb7b60661272c0d5afe6 Mon Sep 17 00:00:00 2001
From: Daniel Stankewitz <vouk@mailbox.org>
Date: Mon, 28 Mar 2022 10:17:10 +0200
Subject: [PATCH] Update ffmpeg-static.yml

---
 .github/workflows/ffmpeg-static.yml | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ffmpeg-static.yml b/.github/workflows/ffmpeg-static.yml
index d493128..95781d3 100644
--- a/.github/workflows/ffmpeg-static.yml
+++ b/.github/workflows/ffmpeg-static.yml
@@ -15,11 +15,12 @@ on:
         
 env:
   vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
-  switches: "--enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac" #--enable-libvpl
+  switches: "--enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvpl"
   NASM_EXECUTABLE: nasm
-  msysConfig: release
-  winConfig: Release
-  cFlags: -MD
+  msysConfig: debug
+  winConfig: Debug
+  cFlags: -MDd
+  useCartwheel: true
   
 jobs:
   liboggvorbis:
@@ -557,14 +558,24 @@ jobs:
       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 FFmpeg
+      if: ${{!env.useCartwheel}}
       uses: actions/checkout@v3.0.0
       with:
         repository: FFmpeg/FFmpeg.git
         ref: release/5.0
         path: ffmpeg
+    - name: Checkout FFmpeg from Cartwheel
+      if: ${{env.useCartwheel}}
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: voukoder-ffmpeg-cartwheel
+        ref: master
+        path: cartwheel
     - name: Checkout NvEnc
       uses: actions/checkout@v3.0.0
       with:
@@ -582,11 +593,19 @@ jobs:
       with:
         path: build_artifacts
     - name: Build FFmpeg
+      if: ${{!env.useCartwheel}}
       shell: cmd
       run: |
         call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
         md build dist
         D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; 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 ../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 ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
+    - name: Build FFmpeg from Cartwheel
+      if: ${{env.useCartwheel}}
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd cartwheel/ffmpeg ; 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" --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 ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
     - name: Publish FFmpeg artifacts
       uses: actions/upload-artifact@v3
       with: