From 6a6ba70ff1fbd58070c42b377fd809f89a831b61 Mon Sep 17 00:00:00 2001
From: LDprg <71488985+LDprg@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:14:42 +0100
Subject: [PATCH 01/26] Update build.yml

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 73f4814..f52a47e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ jobs:
   mingw64-x64:
     name: Build Skia with MinGW Clang
 
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     defaults:
       run:
@@ -13,25 +13,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
-      - uses: msys2/setup-msys2@v2
-        id: msys2
-        with:
-          msystem: MINGW64
-          update: true
-          install: mingw-w64-x86_64-clang mingw-w64-x86_64-lld
-
       - name: "Clone skia"
         run: git clone --depth 1 https://github.com/mono/skia.git skia_repo
       - name: "Build skia"
         run: |
-          "${{ steps.msys2.outputs.msys2-location }}/mingw64/bin/clang" --version
+          clang --version
 
           cd skia_repo
           python3 tools/git-sync-deps
           python3 bin/fetch-ninja
           bin/gn gen out/lib --args='
-            target_os="win"
+            target_os="linux"
             target_cpu="x64"
             is_debug=false
             is_component_build=false
@@ -51,16 +43,14 @@ jobs:
             skia_use_expat=false
             skia_enable_skottie=false
             skia_use_gl=true
-            clang_win="${{ steps.msys2.outputs.msys2-location }}/mingw64"
-            clang_win_version=18
-            cc="${{ steps.msys2.outputs.msys2-location }}/mingw64/bin/clang"
-            cxx="${{ steps.msys2.outputs.msys2-location }}/mingw64/bin/clang++"
+            cc="clang"
+            cxx="clang++"
           '
           third_party/ninja/ninja -C out/lib skia
           
-          mkdir -p ../skia/lib/win-x86_64
+          mkdir -p ../skia/lib
           cp --recursive include ../skia/include
-          cp --recursive out/lib/*.lib ../skia/lib/win-x86_64/
+          cp --recursive out/lib/*.lib ../skia/lib
           
           cd ..
           rm -rf skia_repo

From 05d239126ec8f9a00b37d3138ed6b244ebf415b8 Mon Sep 17 00:00:00 2001
From: LDprg <71488985+LDprg@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:15:30 +0100
Subject: [PATCH 02/26] Update build.zig

---
 build.zig | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/build.zig b/build.zig
index 5db3e37..160fdda 100644
--- a/build.zig
+++ b/build.zig
@@ -10,11 +10,6 @@ pub fn build(b: *std.Build) !void {
     // for restricting supported target set are available.
     const target = b.standardTargetOptions(.{});
 
-    if (target.result.os.tag == .windows and target.result.abi != .msvc) {
-        std.debug.print("Error: Skia requires the `msvc` abi on Windows. Please specify the abi using the build command (e.g. `zig build -Dtarget=x86_64-windows-msvc`) or force it by requesting it in the default_target of b.standardTargetOptions.", .{});
-        //return error.SkiaRequiresMSVConWin; // Temporarily disabled as this breaks ZLS
-    }
-
     // Standard optimization options allow the person running `zig build` to select
     // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
     // set a preferred release mode, allowing the user to decide how to optimize.
@@ -29,7 +24,7 @@ pub fn build(b: *std.Build) !void {
     switch (target.result.os.tag) {
         .windows => {
             var path: [128:0]u8 = undefined;
-            module.addLibraryPath(b.path(try std.fmt.bufPrint(&path, "skia/lib/win-{s}", .{@tagName(target.result.cpu.arch)})));
+            module.addLibraryPath(b.path(try std.fmt.bufPrint(&path, "skia/lib/{s}", .{@tagName(target.result.cpu.arch)})));
         },
         else => return error.PlatformNotSupported,
     }

From 77b1350a71897a48268f54ccdf087c45e9a38ab9 Mon Sep 17 00:00:00 2001
From: LDprg <71488985+LDprg@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:16:38 +0100
Subject: [PATCH 03/26] Update build.yml

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f52a47e..8501d3e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,7 @@
 name: Build Zig package
-on: [push]
+on: 
+  push:
+  workflow_dispatch:
 
 jobs:
   mingw64-x64:

From e2a0de98b2f0bc2aa8ed076d234ea96003423fdd Mon Sep 17 00:00:00 2001
From: LDprg <71488985+LDprg@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:25:05 +0100
Subject: [PATCH 04/26] Update build.yml

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8501d3e..dd6d663 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  mingw64-x64:
-    name: Build Skia with MinGW Clang
+  clang-x64:
+    name: Build Skia
 
     runs-on: ubuntu-latest
 
@@ -44,7 +44,7 @@ jobs:
             skia_enable_tools=false
             skia_use_expat=false
             skia_enable_skottie=false
-            skia_use_gl=true
+            skia_use_vulkan=true
             cc="clang"
             cxx="clang++"
           '

From 78a5fbf88d90413330714a326b2b24fbd3b4eb3c Mon Sep 17 00:00:00 2001
From: LDprg <71488985+LDprg@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:29:50 +0100
Subject: [PATCH 05/26] Update build.yml

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dd6d663..5867a62 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,6 +34,10 @@ jobs:
             skia_enable_fontmgr_win=true
             skia_enable_gpu=true
             skia_enable_pdf=true
+            skia_enable_tools=false
+            skia_enable_skottie=false
+            skia_use_system_expat=false
+            skia_use_system_freetype2=false
             skia_use_system_libjpeg_turbo=false
             skia_use_system_libpng=false
             skia_use_system_libwebp=false
@@ -41,9 +45,8 @@ jobs:
             skia_enable_discrete_gpu=true
             skia_use_harfbuzz=false
             skia_use_icu=false
-            skia_enable_tools=false
+            skia_use_sfntly=false
             skia_use_expat=false
-            skia_enable_skottie=false
             skia_use_vulkan=true
             cc="clang"
             cxx="clang++"

From f04c2d5852ad54798d82f7e0c08f57a569373ca8 Mon Sep 17 00:00:00 2001
From: LDprg <71488985+LDprg@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:37:43 +0100
Subject: [PATCH 06/26] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5867a62..97e3129 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,6 @@ jobs:
             is_component_build=false
             is_static_skiasharp=true
             is_official_build=true
-            skia_enable_fontmgr_win=true
             skia_enable_gpu=true
             skia_enable_pdf=true
             skia_enable_tools=false
@@ -47,6 +46,7 @@ jobs:
             skia_use_icu=false
             skia_use_sfntly=false
             skia_use_expat=false
+           skia_use_piex=true
             skia_use_vulkan=true
             cc="clang"
             cxx="clang++"

From 9e978354291552a7952a9377bfbf55830f85ac2d Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 08:41:44 +0100
Subject: [PATCH 07/26] fix build script

---
 .github/workflows/build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 97e3129..6c73b14 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,7 +35,6 @@ jobs:
             skia_enable_pdf=true
             skia_enable_tools=false
             skia_enable_skottie=false
-            skia_use_system_expat=false
             skia_use_system_freetype2=false
             skia_use_system_libjpeg_turbo=false
             skia_use_system_libpng=false
@@ -46,7 +45,7 @@ jobs:
             skia_use_icu=false
             skia_use_sfntly=false
             skia_use_expat=false
-           skia_use_piex=true
+            skia_use_piex=true
             skia_use_vulkan=true
             cc="clang"
             cxx="clang++"
@@ -55,7 +54,7 @@ jobs:
           
           mkdir -p ../skia/lib
           cp --recursive include ../skia/include
-          cp --recursive out/lib/*.lib ../skia/lib
+          cp --recursive out/lib/*.a ../skia/lib
           
           cd ..
           rm -rf skia_repo

From 564013daf6f9603018a56691f9af9510cbfd3b9a Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 09:00:59 +0100
Subject: [PATCH 08/26] hide rm message

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c73b14..8dfbbf8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
           
           cd ..
           rm -rf skia_repo
-          rm -rf .*
+          rm -rf .* 2>/dev/null
           ls -lah
       - uses: mlugg/setup-zig@v1
         with:

From 3ff89202ba3cf19152e4145baf9e735f421129bf Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 09:30:20 +0100
Subject: [PATCH 09/26] fix rm

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8dfbbf8..ae19850 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
           
           cd ..
           rm -rf skia_repo
-          rm -rf .* 2>/dev/null
+          find -maxdepth 1 -name ".*" -delete
           ls -lah
       - uses: mlugg/setup-zig@v1
         with:

From 3e444151073793fd61ba337fb6805047395facd2 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 09:57:53 +0100
Subject: [PATCH 10/26] fix find

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae19850..5e84d90 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
           
           cd ..
           rm -rf skia_repo
-          find -maxdepth 1 -name ".*" -delete
+          find -maxdepth 1 -name ".*"  ! -name "." ! -name ".." -exec rm -rf {} + 
           ls -lah
       - uses: mlugg/setup-zig@v1
         with:

From 550d4ad56839ee24518332264b2cb2a6b0efa9d5 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 10:19:13 +0100
Subject: [PATCH 11/26] fix build script

---
 build.zig | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/build.zig b/build.zig
index 160fdda..bf4ffc1 100644
--- a/build.zig
+++ b/build.zig
@@ -21,13 +21,9 @@ pub fn build(b: *std.Build) !void {
         .root_source_file = b.path("src/main.zig"),
     });
 
-    switch (target.result.os.tag) {
-        .windows => {
-            var path: [128:0]u8 = undefined;
-            module.addLibraryPath(b.path(try std.fmt.bufPrint(&path, "skia/lib/{s}", .{@tagName(target.result.cpu.arch)})));
-        },
-        else => return error.PlatformNotSupported,
-    }
+    var path: [128:0]u8 = undefined;
+    module.addLibraryPath(b.path(try std.fmt.bufPrint(&path, "skia/lib/", .{})));
+
     module.linkSystemLibrary("skia", .{ .preferred_link_mode = .static });
     module.link_libc = true;
 }

From 7ae5eb49e0a404668c6d08d30fb649a0721ec9d3 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 13:17:25 +0100
Subject: [PATCH 12/26] solve stuff the more linux/zig way

---
 .github/workflows/build.yml | 22 +++++-----------------
 build.zig                   |  7 +++++++
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5e84d90..6af7a86 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: "Clone skia"
         run: git clone --depth 1 https://github.com/mono/skia.git skia_repo
+      - uses: mlugg/setup-zig@v1
+        with:
+          version: 0.13.0
       - name: "Build skia"
         run: |
           clang --version
@@ -33,22 +36,10 @@ jobs:
             is_official_build=true
             skia_enable_gpu=true
             skia_enable_pdf=true
-            skia_enable_tools=false
-            skia_enable_skottie=false
-            skia_use_system_freetype2=false
-            skia_use_system_libjpeg_turbo=false
-            skia_use_system_libpng=false
-            skia_use_system_libwebp=false
-            skia_use_system_zlib=false
             skia_enable_discrete_gpu=true
-            skia_use_harfbuzz=false
-            skia_use_icu=false
-            skia_use_sfntly=false
-            skia_use_expat=false
-            skia_use_piex=true
             skia_use_vulkan=true
-            cc="clang"
-            cxx="clang++"
+            cc="zig cc"
+            cxx="zig c++"
           '
           third_party/ninja/ninja -C out/lib skia
           
@@ -60,9 +51,6 @@ jobs:
           rm -rf skia_repo
           find -maxdepth 1 -name ".*"  ! -name "." ! -name ".." -exec rm -rf {} + 
           ls -lah
-      - uses: mlugg/setup-zig@v1
-        with:
-          version: 0.13.0
       - name: "Generate zig source"
         run: sh generate.sh
       - name: Archive the build
diff --git a/build.zig b/build.zig
index bf4ffc1..15af355 100644
--- a/build.zig
+++ b/build.zig
@@ -25,5 +25,12 @@ pub fn build(b: *std.Build) !void {
     module.addLibraryPath(b.path(try std.fmt.bufPrint(&path, "skia/lib/", .{})));
 
     module.linkSystemLibrary("skia", .{ .preferred_link_mode = .static });
+    module.linkSystemLibrary("libjpeg", .{});
+    module.linkSystemLibrary("libpng", .{});
+    module.linkSystemLibrary("fontconfig", .{});
+    module.linkSystemLibrary("freetype", .{});
+    module.linkSystemLibrary("libwebp", .{});
+    module.linkSystemLibrary("libwebpdemux", .{});
+    module.linkSystemLibrary("zlib", .{});
     module.link_libc = true;
 }

From b76b1ec25d05193eb664528e7bbd99dbbd00023f Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 14:04:28 +0100
Subject: [PATCH 13/26] fix build

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6af7a86..e194406 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,8 +22,6 @@ jobs:
           version: 0.13.0
       - name: "Build skia"
         run: |
-          clang --version
-
           cd skia_repo
           python3 tools/git-sync-deps
           python3 bin/fetch-ninja
@@ -37,6 +35,11 @@ jobs:
             skia_enable_gpu=true
             skia_enable_pdf=true
             skia_enable_discrete_gpu=true
+            skia_use_harfbuzz=false
+            skia_use_icu=false
+            skia_enable_tools=false
+            skia_use_expat=false
+            skia_enable_skottie=false
             skia_use_vulkan=true
             cc="zig cc"
             cxx="zig c++"

From e45a5e9741758e740f7c05f8d5bc465254002096 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 16:34:50 +0100
Subject: [PATCH 14/26] change to opengl

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e194406..490c599 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
             skia_enable_tools=false
             skia_use_expat=false
             skia_enable_skottie=false
-            skia_use_vulkan=true
+            skia_use_gl=true
             cc="zig cc"
             cxx="zig c++"
           '

From 054f6d8f42db93d5222ae329e1b9cd901388d005 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 17:48:33 +0100
Subject: [PATCH 15/26] install missing dependencies

---
 .github/workflows/build.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 490c599..0d9b520 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Install skia dependency
+        run: |
+            sudo apt update
+            sudo apt install -y expat fontconfig libfreetype-dev libharfbuzz-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libwebp-dev
       - name: "Clone skia"
         run: git clone --depth 1 https://github.com/mono/skia.git skia_repo
       - uses: mlugg/setup-zig@v1
@@ -35,11 +39,6 @@ jobs:
             skia_enable_gpu=true
             skia_enable_pdf=true
             skia_enable_discrete_gpu=true
-            skia_use_harfbuzz=false
-            skia_use_icu=false
-            skia_enable_tools=false
-            skia_use_expat=false
-            skia_enable_skottie=false
             skia_use_gl=true
             cc="zig cc"
             cxx="zig c++"

From 452b37b06531f316e061c06482a6904b2e85353b Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 18:22:03 +0100
Subject: [PATCH 16/26] compile herfbuzz

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0d9b520..b807912 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install skia dependency
         run: |
             sudo apt update
-            sudo apt install -y expat fontconfig libfreetype-dev libharfbuzz-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libwebp-dev
+            sudo apt install -y expat fontconfig libfreetype-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libwebp-dev
       - name: "Clone skia"
         run: git clone --depth 1 https://github.com/mono/skia.git skia_repo
       - uses: mlugg/setup-zig@v1
@@ -36,6 +36,7 @@ jobs:
             is_component_build=false
             is_static_skiasharp=true
             is_official_build=true
+            skia_use_system_harfbuzz=false
             skia_enable_gpu=true
             skia_enable_pdf=true
             skia_enable_discrete_gpu=true

From de76041ee1759dbb1882a6f07e7e5fc30c77a000 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 19:08:00 +0100
Subject: [PATCH 17/26] another round

---
 .github/workflows/build.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b807912..7593986 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install skia dependency
         run: |
             sudo apt update
-            sudo apt install -y expat fontconfig libfreetype-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libwebp-dev
+            sudo apt install -y fontconfig libfreetype-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libwebp-dev
       - name: "Clone skia"
         run: git clone --depth 1 https://github.com/mono/skia.git skia_repo
       - uses: mlugg/setup-zig@v1
@@ -36,7 +36,11 @@ jobs:
             is_component_build=false
             is_static_skiasharp=true
             is_official_build=true
-            skia_use_system_harfbuzz=false
+            skia_use_harfbuzz=false
+            skia_use_icu=false
+            skia_enable_tools=false
+            skia_use_expat=false
+            skia_enable_skottie=false
             skia_enable_gpu=true
             skia_enable_pdf=true
             skia_enable_discrete_gpu=true

From bc7d2b17fe855b7ca76b62f1163f45b243e2eab0 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 19:29:59 +0100
Subject: [PATCH 18/26] egl istead of gl and target for zig

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7593986..79ff1d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,9 +44,10 @@ jobs:
             skia_enable_gpu=true
             skia_enable_pdf=true
             skia_enable_discrete_gpu=true
-            skia_use_gl=true
+            skia_use_egl=true
             cc="zig cc"
             cxx="zig c++"
+            extra_cflags=[ "-target x86_64-linux-gnu" ]
           '
           third_party/ninja/ninja -C out/lib skia
           

From 80e0a67fcd48c43a049471243082509c9be75de3 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 19:38:17 +0100
Subject: [PATCH 19/26] fix target

---
 .github/workflows/build.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79ff1d0..36380f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,16 @@ jobs:
             skia_use_egl=true
             cc="zig cc"
             cxx="zig c++"
-            extra_cflags=[ "-target x86_64-linux-gnu" ]
+            extra_asmflags = [
+                "--target=x86_64-linux-gnu"",
+            ]
+            extra_cflags=[
+                "--target=x86_64-linux-gnu"",
+                "-DMESA_EGL_NO_X11_HEADERS",
+            ]
+            extra_ldflags=[
+                "--target=x86_64-linux-gnu"",
+            ]
           '
           third_party/ninja/ninja -C out/lib skia
           

From f7cb97a1035020b13f68dcf1cceb2a2ba4412937 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 19:45:45 +0100
Subject: [PATCH 20/26] move cross compiling to zig

---
 .github/workflows/build.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36380f3..8943df0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,18 +45,11 @@ jobs:
             skia_enable_pdf=true
             skia_enable_discrete_gpu=true
             skia_use_egl=true
-            cc="zig cc"
-            cxx="zig c++"
-            extra_asmflags = [
-                "--target=x86_64-linux-gnu"",
-            ]
+            cc="zig cc -target x86_64-linux-gnu"
+            cxx="zig c++ -target x86_64-linux-gnu"
             extra_cflags=[
-                "--target=x86_64-linux-gnu"",
                 "-DMESA_EGL_NO_X11_HEADERS",
             ]
-            extra_ldflags=[
-                "--target=x86_64-linux-gnu"",
-            ]
           '
           third_party/ninja/ninja -C out/lib skia
           

From ae57c8a39245bad8384cdc8e24bfbbf8565bbe2d Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Thu, 21 Nov 2024 20:07:35 +0100
Subject: [PATCH 21/26] another one

---
 .github/workflows/build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8943df0..40fc5d3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,10 +45,12 @@ jobs:
             skia_enable_pdf=true
             skia_enable_discrete_gpu=true
             skia_use_egl=true
-            cc="zig cc -target x86_64-linux-gnu"
-            cxx="zig c++ -target x86_64-linux-gnu"
+            cc="zig cc"
+            cxx="zig c++"
             extra_cflags=[
+                "-mavx",
                 "-DMESA_EGL_NO_X11_HEADERS",
+                "-DEGL_NO_IMAGE_EXTERNAL",
             ]
           '
           third_party/ninja/ninja -C out/lib skia

From 165f07a3ccb1371905eee94640afe42452c68ae9 Mon Sep 17 00:00:00 2001
From: LDprg <71488985+LDprg@users.noreply.github.com>
Date: Thu, 21 Nov 2024 23:01:27 +0100
Subject: [PATCH 22/26] Aktualisieren von build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40fc5d3..334ff6f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install skia dependency
         run: |
             sudo apt update
-            sudo apt install -y fontconfig libfreetype-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libwebp-dev
+            sudo apt install -y fontconfig libfreetype-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libwebp-dev mesa-utils-extra libgles2-mesa-dev
       - name: "Clone skia"
         run: git clone --depth 1 https://github.com/mono/skia.git skia_repo
       - uses: mlugg/setup-zig@v1

From 80810b7eaeccc02928f601076bf29c968ad85f91 Mon Sep 17 00:00:00 2001
From: LDprg <71488985+LDprg@users.noreply.github.com>
Date: Thu, 21 Nov 2024 23:15:16 +0100
Subject: [PATCH 23/26] Aktualisieren von build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 334ff6f..7300400 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
             cc="zig cc"
             cxx="zig c++"
             extra_cflags=[
-                "-mavx",
+                "-mevex512",
                 "-DMESA_EGL_NO_X11_HEADERS",
                 "-DEGL_NO_IMAGE_EXTERNAL",
             ]

From f6b2fc8a631f30aecf4506f15beb0ddd0dc081f1 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Fri, 22 Nov 2024 07:54:49 +0100
Subject: [PATCH 24/26] Fix egl

---
 .github/workflows/build.yml | 2 --
 build.zig                   | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7300400..53e2f13 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,8 +49,6 @@ jobs:
             cxx="zig c++"
             extra_cflags=[
                 "-mevex512",
-                "-DMESA_EGL_NO_X11_HEADERS",
-                "-DEGL_NO_IMAGE_EXTERNAL",
             ]
           '
           third_party/ninja/ninja -C out/lib skia
diff --git a/build.zig b/build.zig
index 15af355..3334855 100644
--- a/build.zig
+++ b/build.zig
@@ -32,5 +32,7 @@ pub fn build(b: *std.Build) !void {
     module.linkSystemLibrary("libwebp", .{});
     module.linkSystemLibrary("libwebpdemux", .{});
     module.linkSystemLibrary("zlib", .{});
+    module.linkSystemLibrary("opengl", .{});
+    module.linkSystemLibrary("egl", .{});
     module.link_libc = true;
 }

From 794184f98ddb854690cc3ab614fa04c8b9a962f0 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Fri, 22 Nov 2024 10:02:43 +0100
Subject: [PATCH 25/26] optimize build

---
 .github/workflows/build.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 53e2f13..023bf72 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,11 +36,7 @@ jobs:
             is_component_build=false
             is_static_skiasharp=true
             is_official_build=true
-            skia_use_harfbuzz=false
-            skia_use_icu=false
-            skia_enable_tools=false
-            skia_use_expat=false
-            skia_enable_skottie=false
+            skia_use_system_harfbuzz=false
             skia_enable_gpu=true
             skia_enable_pdf=true
             skia_enable_discrete_gpu=true
@@ -49,6 +45,8 @@ jobs:
             cxx="zig c++"
             extra_cflags=[
                 "-mevex512",
+                "-mavx",
+                "-mavx512f",
             ]
           '
           third_party/ninja/ninja -C out/lib skia

From cdff73c2b5a5d13bbbc00cad124428dcfec1e862 Mon Sep 17 00:00:00 2001
From: LDprg <lukas_4dr@gmx.at>
Date: Sat, 23 Nov 2024 13:06:28 +0100
Subject: [PATCH 26/26] move to vulkan again

---
 .github/workflows/build.yml | 5 +++--
 build.zig                   | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 023bf72..3bb07e9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install skia dependency
         run: |
             sudo apt update
-            sudo apt install -y fontconfig libfreetype-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libwebp-dev mesa-utils-extra libgles2-mesa-dev
+            sudo apt install -y fontconfig libfreetype-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libwebp-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools
       - name: "Clone skia"
         run: git clone --depth 1 https://github.com/mono/skia.git skia_repo
       - uses: mlugg/setup-zig@v1
@@ -37,10 +37,11 @@ jobs:
             is_static_skiasharp=true
             is_official_build=true
             skia_use_system_harfbuzz=false
+            skia_use_system_libpng=true
             skia_enable_gpu=true
             skia_enable_pdf=true
             skia_enable_discrete_gpu=true
-            skia_use_egl=true
+            skia_use_vulkan=true
             cc="zig cc"
             cxx="zig c++"
             extra_cflags=[
diff --git a/build.zig b/build.zig
index 3334855..85b39b6 100644
--- a/build.zig
+++ b/build.zig
@@ -32,7 +32,6 @@ pub fn build(b: *std.Build) !void {
     module.linkSystemLibrary("libwebp", .{});
     module.linkSystemLibrary("libwebpdemux", .{});
     module.linkSystemLibrary("zlib", .{});
-    module.linkSystemLibrary("opengl", .{});
-    module.linkSystemLibrary("egl", .{});
+    module.linkSystemLibrary("vulkan", .{});
     module.link_libc = true;
 }