From 070b16cc101795e7802c99f5bd8a3dff46cf5c9e Mon Sep 17 00:00:00 2001
From: Daniel Stankewitz <vouk@mailbox.org>
Date: Sun, 20 Mar 2022 10:14:44 +0100
Subject: [PATCH] Update build.yml

---
 .github/workflows/build.yml | 48 ++++++-------------------------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8db70e5..e18970d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,47 +9,10 @@ on:
         default: 'Debug'
 
 jobs:
-  onevpl:
-    runs-on: windows-2019
-    steps:
-      - name: Set up WSL
-        uses: Vampire/setup-wsl@v1.2.0
-        with:
-          distribution: Debian
-      - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@v1.1
-        with:
-          msbuild-architecture: x64
-      - name: Set up cache
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-ffmpeg
-        with:
-          path: ~/build
-          key: ${{ env.cache-name }}
-      - name: Cloning GIT repository
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-      - name: Build oneVPL
-        shell: wsl-bash {0}
-        run: |
-          PATH=/mnt/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64:/mnt/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin:$PATH
-          mkdir build dist
-          cd build
-          cmake.exe -G "Visual Studio 16 2019" ../repos/oneVPL -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=../dist -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON
-          MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{github.event.inputs.config}} -m oneVPL.sln
-          cd ../dist
-          tar czvf ../oneVPL.tgz include lib
-      - name: Publish artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: oneVPL
-          path: oneVPL.tgz
-          
+
   FFmpeg:
     runs-on: windows-2019
-    needs: [onevpl]
+    needs: []
     steps:
       - name: Set up WSL
         uses: Vampire/setup-wsl@v1.2.0
@@ -68,7 +31,9 @@ jobs:
           key: ${{ env.cache-name }}
       - name: Set up GIT
         shell: cmd {0}
-        run: git config --global core.autocrlf false
+        run: |
+          git config --global core.eol lf
+          git config --global core.autocrlf input
       - name: Cloning GIT repository
         uses: actions/checkout@v3
         with:
@@ -80,9 +45,10 @@ jobs:
       - name: Build FFmpeg
         shell: wsl-bash {0}
         run: |
+          sudo ap-get install dos2unix
           mkdir build
           BUILD=$(realpath build)
           tar zxf *.tgz -C build
           cd repos/ffmpeg
-          bash -c "PKG_CONFIG_PATH=$BUILD/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags='-MDd -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 --enable-libvpl"
+          PKG_CONFIG_PATH=$BUILD/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags='-MDd -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 --enable-libvpl
           ls -laR $BUILD