Skip to content

Fix xscrnsaver hash #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 1, 2025
Merged

Fix xscrnsaver hash #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f09621
Changes xscrnsaver hash
MasonRemaley Aug 1, 2025
3f9379a
Removes extra test from CI, just test master branch Zig
MasonRemaley Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ jobs:
matrix:
zig-version: [master]
os: [ubuntu-latest, windows-latest]
include:
- zig-version: "0.15.0-dev.1218+bc8e1a74c"
os: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand Down
8 changes: 0 additions & 8 deletions build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,7 @@
.xscrnsaver = .{
// This dependency must be kept in sync with `xscrnsaver_windows` for similar reasons explained in the `pulseaudio` dependency.
.url = "https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver/-/archive/libXScrnSaver-1.2.4/libxscrnsaver-libXScrnSaver-1.2.4.tar.gz",
.hash = "N-V-__8AAMXRAAAKIBB3YHvwcykG71lH-HtylfJ0AV048a7V",
.lazy = true,
},
.xscrnsaver_windows = .{
// This is a duplicate of `xscrnsaver`, but with a different hash due to a Zig bug that
// results in a different hash on Windows than Linux.
.url = "https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver/-/archive/libXScrnSaver-1.2.4/libxscrnsaver-libXScrnSaver-1.2.4.tar.gz",
.hash = "N-V-__8AAEO3AADhS3i2HiVniZnPqWJh33VqmmUp7JO33xqe",
.lazy = true,
},
.alsa = .{
.url = "https://github.com/alsa-project/alsa-lib/archive/refs/tags/v1.2.14.tar.gz",
Expand Down
11 changes: 1 addition & 10 deletions src/linux.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,16 +436,6 @@ pub fn build(
lib.addIncludePath(b.path("deps/alsa/include"));
}

// Provide the xscrnsaver headers. Conditional is workaround for cross compilation, see
// comment in `build.zig.zon`
const xscrnsaver_name = switch (@import("builtin").os.tag) {
.windows => "xscrnsaver_windows",
else => "xscrnsaver",
};
if (b.lazyDependency(xscrnsaver_name, .{})) |xscrnsaver| {
lib.addIncludePath(xscrnsaver.path("include"));
}

// Provide upstream headers that don't require any special handling
lib.addIncludePath(b.dependency("egl", .{}).path("api"));
lib.addIncludePath(b.dependency("opengl", .{}).path("api"));
Expand All @@ -457,6 +447,7 @@ pub fn build(
lib.addIncludePath(b.dependency("xfixes", .{}).path("include"));
lib.addIncludePath(b.dependency("xrandr", .{}).path("include"));
lib.addIncludePath(b.dependency("xrender", .{}).path("include"));
lib.addIncludePath(b.dependency("xscrnsaver", .{}).path("include"));
lib.addIncludePath(b.dependency("jack", .{}).path("common"));
lib.addIncludePath(b.dependency("sndio", .{}).path("libsndio"));
lib.addIncludePath(b.path("deps/wayland/protocols"));
Expand Down