commit 5c7f4457114e077c8db64117201d4d328bb016cc
parent b09d8281f8b8919bdcbf90aa363cf3a249e367f5
Author: Tomas Nemec <owl@gtms.dev>
Date: Mon, 28 Jul 2025 17:56:28 +0200
build: zig update
Diffstat:
6 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/.nvim.lua b/.nvim.lua
@@ -0,0 +1 @@
+vim.cmd.compiler "zig_build"
diff --git a/build.zig b/build.zig
@@ -19,9 +19,9 @@ pub fn build(b: *std.Build) void {
scanner.addSystemProtocol("stable/xdg-shell/xdg-shell.xml");
scanner.addSystemProtocol("stable/viewporter/viewporter.xml");
scanner.addSystemProtocol("staging/single-pixel-buffer/single-pixel-buffer-v1.xml");
- scanner.addCustomProtocol("protocol/wlr-layer-shell-unstable-v1.xml");
- scanner.addCustomProtocol("protocol/river-status-unstable-v1.xml");
- scanner.addCustomProtocol("protocol/river-control-unstable-v1.xml");
+ scanner.addCustomProtocol(b.path("protocol/wlr-layer-shell-unstable-v1.xml"));
+ scanner.addCustomProtocol(b.path("protocol/river-status-unstable-v1.xml"));
+ scanner.addCustomProtocol(b.path("protocol/river-control-unstable-v1.xml"));
scanner.generate("wl_compositor", 4);
scanner.generate("wl_subcompositor", 1);
@@ -50,7 +50,7 @@ pub fn build(b: *std.Build) void {
exe.linkSystemLibrary("libpulse");
exe.linkSystemLibrary("wayland-client");
- scanner.addCSource(exe);
+ // exe.addCSourceFile(exe);
b.installArtifact(exe);
diff --git a/build.zig.zon b/build.zig.zon
@@ -1,25 +1,23 @@
.{
- .name = "levee",
+ .name = .stevee,
.version = "0.1.4",
.paths = .{
".",
},
.dependencies = .{
.wayland = .{
- .url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz",
- .hash = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242",
+ .path = "deps/zig-wayland",
},
.pixman = .{
- .url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz",
- .hash = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56",
+ .path = "deps/zig-pixman",
},
.fcft = .{
- .url = "https://git.sr.ht/~novakane/zig-fcft/archive/40691ff2df73ff09724d19791c8da8f966a95c6a.tar.gz",
- .hash = "1220a4029ee3ee70d3175c69878e2b70dccd000c4324bc74ba800d8a143b7250fb38",
+ .path = "deps/zig-fcft",
},
.udev = .{
.url = "https://git.sr.ht/~andreafeletto/zig-udev/archive/442a1c2b6c9f1f672c234b9ee977e4d3c2408f9a.tar.gz",
.hash = "122064e2c4230105728ba521c61ad545bfabbe79987d316756fb8a9477b1609df889",
},
},
+ .fingerprint = 0x49f08125c7f965b7,
}
diff --git a/deps/zig-fcft/build.zig.zon b/deps/zig-fcft/build.zig.zon
@@ -9,8 +9,7 @@
},
.dependencies = .{
.pixman = .{
- .url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz",
- .hash = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX",
+ .path = "../zig-pixman",
},
},
.fingerprint = 0x11577bbe0b7acccd,
diff --git a/src/Wayland.zig b/src/Wayland.zig
@@ -109,26 +109,26 @@ fn registryListener(registry: *wl.Registry, event: wl.Registry.Event, self: *Way
}
fn bindGlobal(self: *Wayland, registry: *wl.Registry, name: u32, iface: [*:0]const u8) !void {
- if (std.mem.orderZ(u8, iface, wl.Compositor.getInterface().name) == .eq) {
+ if (std.mem.orderZ(u8, iface, wl.Compositor.interface.name) == .eq) {
self.compositor = try registry.bind(name, wl.Compositor, 4);
- } else if (std.mem.orderZ(u8, iface, wl.Subcompositor.getInterface().name) == .eq) {
+ } else if (std.mem.orderZ(u8, iface, wl.Subcompositor.interface.name) == .eq) {
self.subcompositor = try registry.bind(name, wl.Subcompositor, 1);
- } else if (std.mem.orderZ(u8, iface, wl.Shm.getInterface().name) == .eq) {
+ } else if (std.mem.orderZ(u8, iface, wl.Shm.interface.name) == .eq) {
self.shm = try registry.bind(name, wl.Shm, 1);
- } else if (std.mem.orderZ(u8, iface, wp.Viewporter.getInterface().name) == .eq) {
+ } else if (std.mem.orderZ(u8, iface, wp.Viewporter.interface.name) == .eq) {
self.viewporter = try registry.bind(name, wp.Viewporter, 1);
- } else if (std.mem.orderZ(u8, iface, wp.SinglePixelBufferManagerV1.getInterface().name) == .eq) {
+ } else if (std.mem.orderZ(u8, iface, wp.SinglePixelBufferManagerV1.interface.name) == .eq) {
self.single_pixel_buffer_manager = try registry.bind(name, wp.SinglePixelBufferManagerV1, 1);
- } else if (std.mem.orderZ(u8, iface, zwlr.LayerShellV1.getInterface().name) == .eq) {
+ } else if (std.mem.orderZ(u8, iface, zwlr.LayerShellV1.interface.name) == .eq) {
self.layer_shell = try registry.bind(name, zwlr.LayerShellV1, 1);
- } else if (std.mem.orderZ(u8, iface, zriver.StatusManagerV1.getInterface().name) == .eq) {
+ } else if (std.mem.orderZ(u8, iface, zriver.StatusManagerV1.interface.name) == .eq) {
self.status_manager = try registry.bind(name, zriver.StatusManagerV1, 1);
- } else if (std.mem.orderZ(u8, iface, zriver.ControlV1.getInterface().name) == .eq) {
+ } else if (std.mem.orderZ(u8, iface, zriver.ControlV1.interface.name) == .eq) {
self.control = try registry.bind(name, zriver.ControlV1, 1);
- } else if (std.mem.orderZ(u8, iface, wl.Output.getInterface().name) == .eq) {
+ } else if (std.mem.orderZ(u8, iface, wl.Output.interface.name) == .eq) {
const monitor = try Monitor.create(registry, name);
try self.monitors.append(monitor);
- } else if (std.mem.orderZ(u8, iface, wl.Seat.getInterface().name) == .eq) {
+ } else if (std.mem.orderZ(u8, iface, wl.Seat.interface.name) == .eq) {
const input = try Input.create(registry, name);
try self.inputs.append(input);
}
diff --git a/src/modules/Battery.zig b/src/modules/Battery.zig
@@ -25,12 +25,12 @@ const DeviceList = std.ArrayList(Device);
pub fn init() !Battery {
const tfd = tfd: {
const fd = try std.posix.timerfd_create(
- std.posix.CLOCK.MONOTONIC,
+ std.os.linux.TIMERFD_CLOCK.MONOTONIC,
.{ .CLOEXEC = true },
);
const interval: std.os.linux.itimerspec = .{
- .it_interval = .{ .tv_sec = 10, .tv_nsec = 0 },
- .it_value = .{ .tv_sec = 10, .tv_nsec = 0 },
+ .it_interval = .{ .sec = 10, .nsec = 0 },
+ .it_value = .{ .sec = 10, .nsec = 0 },
};
try std.posix.timerfd_settime(@intCast(fd), .{}, &interval, null);
break :tfd @as(std.posix.fd_t, @intCast(fd));
