Skip to content

Fix build for Zig 0.18.0-dev.610+720939f8c #50

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
MasonRemaley merged 2 commits into from
Oct 27, 2026
Merged

Fix build for Zig 0.18.0-dev.610+720939f8c #50

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
ccc244b
Fix build for Zig 0.18.0-dev.610+720939f8c
jayschwa Oct 23, 2026
b5ff128
Minor style change
MasonRemaley Oct 26, 2026
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
2 changes: 1 addition & 1 deletion build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub fn build(b: *std.Build) !void {

// Get the SO version. This is the same as the SDL version, but the major version is elided
// since it's baked into the name. This mirrors the official build process.
var sdl_so_version = comptime std.SemanticVersion.parse(build_zon.dependencies.sdl.version) catch unreachable;
var sdl_so_version = comptime std.SemanticVersion.parse(build_zon.dependencies.sdl.upstream_version) catch unreachable;
assert(sdl_so_version.major == 3);
sdl_so_version.major = 0;

Expand Down
20 changes: 10 additions & 10 deletions build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.{
.name = .sdl,
.fingerprint = 0xec638ccbd103848b,
.version = "1.0.8+3.4.18",
.version = "1.0.9+3.4.18",
.minimum_zig_version = "0.16.0",
.dependencies = .{
.sdl = .{
.url = "https://github.com/libsdl-org/SDL/archive/refs/tags/release-3.4.18.tar.gz",
.hash = "N-V-__8AACpx-AKEJIUZ0-XrP9-96MpSaw17FJ7L6B7LmO42",
.version = "3.4.18",
.upstream_version = "3.4.18", // https://github.com/allyourcodebase/SDL/issues/44
},
// Linux dependencies
.dbus = .{
.version = "1.16.2",
.upstream_version = "1.16.2",
.url = "https://gitlab.freedesktop.org/dbus/dbus/-/archive/dbus-1.16.2/dbus-dbus-1.16.2.tar.gz",
.hash = "N-V-__8AALxqaQCXLK7KmtlbRHzj5quTSajWtJZ86Qy7aBxj",
.lazy = true,
Expand All @@ -22,13 +22,13 @@
.lazy = true,
},
.wayland = .{
.version = "1.26.0",
.upstream_version = "1.26.0",
.url = "git+https://gitlab.freedesktop.org/wayland/wayland?ref=1.26.0#87cc8a8728a923fc57938faa81ba0e74f34ecdc7",
.hash = "N-V-__8AAA46JQABKU7sa-6xGUAN44uFsYSUS_w79UVuu7qo",
.lazy = true,
},
.xkbcommon = .{
.version = "1.13.2",
.upstream_version = "1.13.2",
.url = "https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-1.13.2.tar.gz",
.hash = "N-V-__8AAGh7bAAD9LH6Hh6HB6br9SDZmRBbRu-_1NNpQ4GL",
.lazy = true,
Expand Down Expand Up @@ -59,7 +59,7 @@
.lazy = true,
},
.xcursor = .{
.version = "1.2.3",
.upstream_version = "1.2.3",
.url = "https://gitlab.freedesktop.org/xorg/lib/libxcursor/-/archive/libXcursor-1.2.3/libxcursor-libXcursor-1.2.3.tar.gz",
.hash = "N-V-__8AAKtlAgAAqwksheZkCSajEEPpi2XivNet-_3hZyz2",
.lazy = true,
Expand Down Expand Up @@ -88,13 +88,13 @@
.url = "https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/0.2.5/libdecor-0.2.5.tar.gz",
.hash = "N-V-__8AADG6BADZ6vLbOD3OrWhDYa5jrubmgY-ljspuv-4R",
.lazy = true,
.version = "0.2.5",
.upstream_version = "0.2.5",
},
.pipewire = .{
.url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/1.6.8/pipewire-1.6.8.tar.gz",
.hash = "N-V-__8AAEBm3gCliUlb1HgAJA-3XvTWKC2YfRa5hJMiaEld",
.lazy = true,
.version = "1.6.8",
.upstream_version = "1.6.8",
.api_version = "0.3", // From `meson.build`, does not directly track `version`!
},
.jack = .{
Expand All @@ -111,7 +111,7 @@
// Upstream: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/
.url = "https://github.com/Games-by-Mason/pulseaudio/archive/refs/tags/v16.2.tar.gz",
.hash = "N-V-__8AADiK2wBbQBbppKI9s1sR8vTGLV1mhn44OEYxyPD4",
.version = "16.2.0",
.upstream_version = "16.2.0",
.api_version = "12", // From `meson.build`, does not directly track version!
.protocol_version = "35", // From `meson.build`, does not directly track version!
.lazy = true,
Expand Down Expand Up @@ -140,7 +140,7 @@
.lazy = true,
},
.fribidi = .{
.version = "1.0.16",
.upstream_version = "1.0.16",
.interface_version = 4,
.unicode_version = "16.0.0",
.url = "https://github.com/fribidi/fribidi/archive/refs/tags/v1.0.16.tar.gz",
Expand Down
18 changes: 9 additions & 9 deletions src/linux.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub fn build(
if (root.lazyDependency(&lib.step, "dbus", .{})) |dbus| {
lib.root_module.addIncludePath(dbus.path("."));

const version_string = build_zon.dependencies.dbus.version;
const version_string = build_zon.dependencies.dbus.upstream_version;
const version = comptime std.SemanticVersion.parse(version_string) catch unreachable;
std.debug.assert(target.cTypeByteSize(.short) == 2);
std.debug.assert(target.cTypeByteSize(.int) == 4);
Expand Down Expand Up @@ -309,7 +309,7 @@ pub fn build(

// Provide the Xcursor headers
if (root.lazyDependency(&lib.step, "xcursor", .{})) |xcursor| {
const version_string = build_zon.dependencies.xcursor.version;
const version_string = build_zon.dependencies.xcursor.upstream_version;
const version = comptime std.SemanticVersion.parse(version_string) catch unreachable;
const config = b.addConfigHeader(.{
.style = .{ .autoconf_undef = xcursor.path("include/X11/Xcursor/Xcursor.h.in") },
Expand Down Expand Up @@ -341,7 +341,7 @@ pub fn build(
});
_ = generated.addCopyFile(compat_h.getOutputFile(), compat_h.include_path);

const version_string = build_zon.dependencies.decor.version;
const version_string = build_zon.dependencies.decor.upstream_version;
const version = comptime std.SemanticVersion.parse(version_string) catch unreachable;
const version_h = b.addConfigHeader(.{
.style = .{ .autoconf_undef = b.path("deps/liburing/io_uring_version.h.in") },
Expand All @@ -357,7 +357,7 @@ pub fn build(
if (root.lazyDependency(&lib.step, "pipewire", .{})) |pipewire| {
lib.root_module.addIncludePath(pipewire.path("spa/include"));
lib.root_module.addIncludePath(pipewire.path("src"));
const version_string = build_zon.dependencies.pipewire.version;
const version_string = build_zon.dependencies.pipewire.upstream_version;
const api_version_string = build_zon.dependencies.pipewire.api_version;
const version = comptime std.SemanticVersion.parse(version_string) catch unreachable;
const config_h = b.addConfigHeader(.{
Expand All @@ -377,7 +377,7 @@ pub fn build(
@setEvalBranchQuota(2000);
if (root.lazyDependency(&lib.step, pulseaudio_name, .{})) |pulseaudio| {
lib.root_module.addIncludePath(pulseaudio.path("src"));
const version_string = build_zon.dependencies.pulseaudio.version;
const version_string = build_zon.dependencies.pulseaudio.upstream_version;
const version = comptime std.SemanticVersion.parse(version_string) catch unreachable;
const api_version_string = build_zon.dependencies.pulseaudio.api_version;
const api_version = comptime std.fmt.parseInt(u32, api_version_string, 10) catch unreachable;
Expand All @@ -403,7 +403,7 @@ pub fn build(
lib.root_module.addIncludePath(wayland.path("egl"));

// Provide the config header
const version_string = build_zon.dependencies.wayland.version;
const version_string = build_zon.dependencies.wayland.upstream_version;
const version = comptime std.SemanticVersion.parse(version_string) catch unreachable;
const version_h = b.addConfigHeader(.{
.style = .{ .cmake = wayland.path("src/wayland-version.h.in") },
Expand Down Expand Up @@ -436,7 +436,7 @@ pub fn build(
// Provide the Fribidi headers
if (root.lazyDependency(&lib.step, "fribidi", .{})) |fribidi| {
const interface_version = build_zon.dependencies.fribidi.interface_version;
const version_string = build_zon.dependencies.fribidi.version;
const version_string = build_zon.dependencies.fribidi.upstream_version;
const version = comptime std.SemanticVersion.parse(version_string) catch unreachable;

const unicode_version_string = build_zon.dependencies.fribidi.unicode_version;
Expand Down Expand Up @@ -525,9 +525,9 @@ pub fn build(
//
// Dynamic library versions are from Steam Linux Runtime 3.0 Sniper unless otherwise noted:
// https://gitlab.steamos.cloud/steamrt/steamrt/-/tree/steamrt/sniper
const libdecor_version_string = build_zon.dependencies.decor.version;
const libdecor_version_string = build_zon.dependencies.decor.upstream_version;
const libdecor_version = comptime std.SemanticVersion.parse(libdecor_version_string) catch unreachable;
const xkbcommon_version_string = build_zon.dependencies.xkbcommon.version;
const xkbcommon_version_string = build_zon.dependencies.xkbcommon.upstream_version;
const xkbcommon_version = comptime std.SemanticVersion.parse(xkbcommon_version_string) catch unreachable;
const have_sigtimedwait: i64 = if (target.os.tag == .openbsd) 0 else 1;
build_config_h.addValues(.{
Expand Down
Loading