build latest libslirp

kvnp · Dec 25, 2023 · 4bef21b · 4bef21b
1 parent 201513a
commit 4bef21b
Showing 1 changed file with 36 additions and 3 deletions.
diff --git a/.github/workflows/build-windows-vcpkg.yml b/.github/workflows/build-windows-vcpkg.yml
@@ -13,12 +13,12 @@ env:
 
 jobs:
   build:
-    name: ${{ matrix.target }}-${{ github.workflow }}
+    name: ${{ matrix.target }}
     runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
-        target: [x64-mingw-static, arm64-mingw-static]
+        target: [x64-windows-static, arm64-windows-static]
 
     env:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.target }}
@@ -30,11 +30,44 @@ jobs:
         with:
           repository: "microsoft/vcpkg"
           path: "vcpkg"
-      - name: Retrieve version
+      - name: Retrieve version and apply libslirp patch
         shell: "bash"
         run: |
           cd vcpkg
           echo "GIT_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+          tee -a ./libslirp-update.patch << END
+          diff --git a/ports/libslirp/portfile.cmake b/ports/libslirp/portfile.cmake
+          index 0bd6e252c..756e4b9b8 100644
+          --- a/ports/libslirp/portfile.cmake
+          +++ b/ports/libslirp/portfile.cmake
+          @@ -2,8 +2,8 @@ vcpkg_from_gitlab(
+              GITLAB_URL https://gitlab.freedesktop.org/
+              OUT_SOURCE_PATH SOURCE_PATH
+              REPO slirp/libslirp
+          -    REF v4.7.0
+          -    SHA512 387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f
+          +    REF 129077f9870426d1b7b3a8239d8b5a50bee017b4
+          +    SHA512 0
+              HEAD_REF master
+          )
+          
+          diff --git a/ports/libslirp/vcpkg.json b/ports/libslirp/vcpkg.json
+          index 032e5cc5d..f849f54c3 100644
+          --- a/ports/libslirp/vcpkg.json
+          +++ b/ports/libslirp/vcpkg.json
+          @@ -4,7 +4,7 @@
+            "description": "libslirp is a user-mode networking library used by virtual machines, containers or various tools.",
+            "homepage": "https://gitlab.freedesktop.org/slirp/libslirp",
+            "license": "BSD-3-Clause",
+          -  "supports": "!windows | mingw",
+          +  "supports": "windows | mingw",
+            "dependencies": [
+              "glib",
+              {
+          END
+
+          git apply ./libslirp-update.patch --reject --whitespace=fix
         id: version
 
       - uses: lukka/get-cmake@latest