From cb19b23f5826744ccf3b09fbdc173bd424471089 Mon Sep 17 00:00:00 2001 From: "Wrench[bot]" Date: Sat, 1 Jun 2024 17:26:11 -0700 Subject: [PATCH 1/2] all: update Zig to version 0.13.0-dev.351+64ef45eb0 Signed-off-by: Wrench[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17a24c96..4adfef0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,6 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.3180+83e578a18.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.13.0-dev.351+64ef45eb0.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: build run: zig build From c97923f8127344053069b56845df1b21bd2a3d12 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 2 Jun 2024 11:46:10 -0700 Subject: [PATCH 2/2] update to Zig 2024.05 Signed-off-by: Stephen Gutekanst --- .gitignore | 1 + build.zig | 25 ++++++------------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index a9239f43..e69c8e43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Zig stuff /zig-* +.zig-cache diff --git a/build.zig b/build.zig index d3131670..dd77ee8c 100644 --- a/build.zig +++ b/build.zig @@ -11,25 +11,12 @@ pub fn build(b: *std.Build) void { .optimize = optimize, }); - installHeadersDirectoryExcludeLicenseFiles(lib, "alsa-lib", "."); - installHeadersDirectoryExcludeLicenseFiles(lib, "jack", "jack"); - installHeadersDirectoryExcludeLicenseFiles(lib, "pipewire", "pipewire"); - installHeadersDirectoryExcludeLicenseFiles(lib, "pulse", "pulse"); - installHeadersDirectoryExcludeLicenseFiles(lib, "sndio", "."); - installHeadersDirectoryExcludeLicenseFiles(lib, "spa", "spa"); + lib.installHeadersDirectory(b.path("alsa-lib"), ".", .{}); + lib.installHeadersDirectory(b.path("jack"), "jack", .{}); + lib.installHeadersDirectory(b.path("pipewire"), "pipewire", .{}); + lib.installHeadersDirectory(b.path("pulse"), "pulse", .{}); + lib.installHeadersDirectory(b.path("sndio"), ".", .{}); + lib.installHeadersDirectory(b.path("spa"), "spa", .{}); b.installArtifact(lib); } - -fn installHeadersDirectoryExcludeLicenseFiles( - lib: *std.Build.Step.Compile, - src_dir_path: []const u8, - dest_rel_path: []const u8, -) void { - lib.installHeadersDirectoryOptions(.{ - .source_dir = .{ .path = src_dir_path }, - .install_dir = .header, - .install_subdir = dest_rel_path, - .exclude_extensions = &.{ "COPYING", "LICENSE" }, - }); -}