zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sysaudio: switch to sdk builder pattern for system_sdk access

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-09-10 03:02:00 +00:00 • committed by Stephen Gutekanst
parent f29c3aac08
commit 7511392a02
5 changed files with 141 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

134
libs/sysaudio/build.zig
View file

@ -1,30 +1,16 @@
const std = @import("std"); const std = @import("std");
const Builder = std.build.Builder; const sysaudio_sdk = @import("sdk.zig");
const sysjs = @import("libs/mach-sysjs/build.zig"); const system_sdk = @import("libs/mach-glfw/system_sdk.zig");
const soundio_path = thisDir() ++ "/upstream/soundio"; pub fn build(b: *std.build.Builder) void {
pub const pkg = std.build.Pkg{
.name = "sysaudio",
.source = .{ .path = thisDir() ++ "/src/main.zig" },
.dependencies = &.{ sysjs.pkg, soundio_pkg },
};
const soundio_pkg = std.build.Pkg{
.name = "soundio",
.source = .{ .path = thisDir() ++ "/soundio/main.zig" },
};
pub const Options = struct {
install_libs: bool = false,
};
pub fn build(b: *Builder) void {
const mode = b.standardReleaseOptions(); const mode = b.standardReleaseOptions();
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const sysaudio = sysaudio_sdk.Sdk(.{
.system_sdk = system_sdk,
});
const test_step = b.step("test", "Run library tests"); const test_step = b.step("test", "Run library tests");
test_step.dependOn(&testStep(b, mode, target).step); test_step.dependOn(&sysaudio.testStep(b, mode, target).step);
inline for ([_][]const u8{ inline for ([_][]const u8{
"soundio-sine-wave", "soundio-sine-wave",
@ -32,8 +18,8 @@ pub fn build(b: *Builder) void {
const example_exe = b.addExecutable("example-" ++ example, "examples/" ++ example ++ ".zig"); const example_exe = b.addExecutable("example-" ++ example, "examples/" ++ example ++ ".zig");
example_exe.setBuildMode(mode); example_exe.setBuildMode(mode);
example_exe.setTarget(target); example_exe.setTarget(target);
example_exe.addPackage(soundio_pkg); example_exe.addPackage(sysaudio.soundio_pkg);
link(b, example_exe, .{}); sysaudio.link(b, example_exe, .{});
example_exe.install(); example_exe.install();
const example_compile_step = b.step("example-" ++ example, "Compile '" ++ example ++ "' example"); const example_compile_step = b.step("example-" ++ example, "Compile '" ++ example ++ "' example");
@ -49,105 +35,3 @@ pub fn build(b: *Builder) void {
example_run_step.dependOn(&example_run_cmd.step); example_run_step.dependOn(&example_run_cmd.step);
} }
} }
pub fn testStep(b: *std.build.Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *std.build.RunStep {
const soundio_tests = b.addTestExe("soundio-tests", (comptime thisDir()) ++ "/soundio/main.zig");
soundio_tests.setBuildMode(mode);
soundio_tests.setTarget(target);
link(b, soundio_tests, .{});
soundio_tests.install();
const main_tests = b.addTestExe("sysaudio-tests", (comptime thisDir()) ++ "/src/main.zig");
main_tests.setBuildMode(mode);
main_tests.setTarget(target);
main_tests.addPackage(soundio_pkg);
link(b, main_tests, .{});
main_tests.install();
const main_tests_run = main_tests.run();
main_tests_run.step.dependOn(&soundio_tests.run().step);
return main_tests_run;
}
pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void {
if (step.target.toTarget().cpu.arch != .wasm32) {
const soundio_lib = buildSoundIo(b, step.build_mode, step.target, options);
step.linkLibrary(soundio_lib);
step.addIncludePath(soundio_path);
}
}
fn buildSoundIo(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget, options: Options) *std.build.LibExeObjStep {
// TODO(build-system): https://github.com/hexops/mach/issues/229#issuecomment-1100958939
ensureDependencySubmodule(b.allocator, "upstream") catch unreachable;
const config_base =
\\#ifndef SOUNDIO_CONFIG_H
\\#define SOUNDIO_CONFIG_H
\\#define SOUNDIO_VERSION_MAJOR 2
\\#define SOUNDIO_VERSION_MINOR 0
\\#define SOUNDIO_VERSION_PATCH 0
\\#define SOUNDIO_VERSION_STRING "2.0.0"
\\
;
var config_file = std.fs.cwd().createFile(soundio_path ++ "/src/config.h", .{}) catch unreachable;
defer config_file.close();
config_file.writeAll(config_base) catch unreachable;
const lib = b.addStaticLibrary("soundio", null);
lib.setBuildMode(mode);
lib.setTarget(target);
lib.linkLibC();
lib.addIncludePath(soundio_path);
lib.addCSourceFiles(soundio_sources, &.{});
const target_info = (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
if (target_info.isDarwin()) {
lib.addCSourceFile(soundio_path ++ "/src/coreaudio.c", &.{});
lib.linkFramework("AudioToolbox");
lib.linkFramework("CoreFoundation");
lib.linkFramework("CoreAudio");
config_file.writeAll("#define SOUNDIO_HAVE_COREAUDIO\n") catch unreachable;
} else if (target_info.os.tag == .linux) {
lib.addCSourceFile(soundio_path ++ "/src/alsa.c", &.{});
lib.linkSystemLibrary("asound");
config_file.writeAll("#define SOUNDIO_HAVE_ALSA\n") catch unreachable;
} else if (target_info.os.tag == .windows) {
lib.addCSourceFile(soundio_path ++ "/src/wasapi.c", &.{});
lib.linkSystemLibrary("ole32");
config_file.writeAll("#define SOUNDIO_HAVE_WASAPI\n") catch unreachable;
}
config_file.writeAll("#endif\n") catch unreachable;
if (options.install_libs)
lib.install();
return lib;
}
fn ensureDependencySubmodule(allocator: std.mem.Allocator, path: []const u8) !void {
if (std.process.getEnvVarOwned(allocator, "NO_ENSURE_SUBMODULES")) |no_ensure_submodules| {
defer allocator.free(no_ensure_submodules);
if (std.mem.eql(u8, no_ensure_submodules, "true")) return;
} else |_| {}
var child = std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator);
child.cwd = (comptime thisDir());
child.stderr = std.io.getStdErr();
child.stdout = std.io.getStdOut();
_ = try child.spawnAndWait();
}
fn thisDir() []const u8 {
return std.fs.path.dirname(@src().file) orelse ".";
}
const soundio_sources = &[_][]const u8{
soundio_path ++ "/src/soundio.c",
soundio_path ++ "/src/util.c",
soundio_path ++ "/src/os.c",
soundio_path ++ "/src/dummy.c",
soundio_path ++ "/src/channel_layout.c",
soundio_path ++ "/src/ring_buffer.c",
};

1
libs/sysaudio/libs/mach-glfw Symbolic link
View file

@ -0,0 +1 @@
../../glfw

128
libs/sysaudio/sdk.zig Normal file
View file

@ -0,0 +1,128 @@
const std = @import("std");
const sysjs = @import("libs/mach-sysjs/build.zig");
pub fn Sdk(comptime deps: anytype) type {
return struct {
const soundio_path = thisDir() ++ "/upstream/soundio";
pub const pkg = std.build.Pkg{
.name = "sysaudio",
.source = .{ .path = thisDir() ++ "/src/main.zig" },
.dependencies = &.{ sysjs.pkg, soundio_pkg },
};
pub const soundio_pkg = std.build.Pkg{
.name = "soundio",
.source = .{ .path = thisDir() ++ "/soundio/main.zig" },
};
pub const Options = struct {
install_libs: bool = false,
};
pub fn testStep(b: *std.build.Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *std.build.RunStep {
const soundio_tests = b.addTestExe("soundio-tests", (comptime thisDir()) ++ "/soundio/main.zig");
soundio_tests.setBuildMode(mode);
soundio_tests.setTarget(target);
link(b, soundio_tests, .{});
soundio_tests.install();
const main_tests = b.addTestExe("sysaudio-tests", (comptime thisDir()) ++ "/src/main.zig");
main_tests.setBuildMode(mode);
main_tests.setTarget(target);
main_tests.addPackage(soundio_pkg);
link(b, main_tests, .{});
main_tests.install();
const main_tests_run = main_tests.run();
main_tests_run.step.dependOn(&soundio_tests.run().step);
return main_tests_run;
}
pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Options) void {
if (step.target.toTarget().cpu.arch != .wasm32) {
// TODO(build-system): pass system SDK options through
const soundio_lib = buildSoundIo(b, step.build_mode, step.target, options);
step.linkLibrary(soundio_lib);
step.addIncludePath(soundio_path);
deps.system_sdk.include(b, step, .{});
}
}
fn buildSoundIo(b: *std.build.Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget, options: Options) *std.build.LibExeObjStep {
// TODO(build-system): https://github.com/hexops/mach/issues/229#issuecomment-1100958939
ensureDependencySubmodule(b.allocator, "upstream") catch unreachable;
const config_base =
\\#ifndef SOUNDIO_CONFIG_H
\\#define SOUNDIO_CONFIG_H
\\#define SOUNDIO_VERSION_MAJOR 2
\\#define SOUNDIO_VERSION_MINOR 0
\\#define SOUNDIO_VERSION_PATCH 0
\\#define SOUNDIO_VERSION_STRING "2.0.0"
\\
;
var config_file = std.fs.cwd().createFile(soundio_path ++ "/src/config.h", .{}) catch unreachable;
defer config_file.close();
config_file.writeAll(config_base) catch unreachable;
const lib = b.addStaticLibrary("soundio", null);
lib.setBuildMode(mode);
lib.setTarget(target);
lib.linkLibC();
lib.addIncludePath(soundio_path);
lib.addCSourceFiles(soundio_sources, &.{});
deps.system_sdk.include(b, lib, .{});
const target_info = (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
if (target_info.isDarwin()) {
lib.addCSourceFile(soundio_path ++ "/src/coreaudio.c", &.{});
lib.linkFramework("AudioToolbox");
lib.linkFramework("CoreFoundation");
lib.linkFramework("CoreAudio");
config_file.writeAll("#define SOUNDIO_HAVE_COREAUDIO\n") catch unreachable;
} else if (target_info.os.tag == .linux) {
lib.addCSourceFile(soundio_path ++ "/src/alsa.c", &.{});
lib.linkSystemLibrary("asound");
config_file.writeAll("#define SOUNDIO_HAVE_ALSA\n") catch unreachable;
} else if (target_info.os.tag == .windows) {
lib.addCSourceFile(soundio_path ++ "/src/wasapi.c", &.{});
lib.linkSystemLibrary("ole32");
config_file.writeAll("#define SOUNDIO_HAVE_WASAPI\n") catch unreachable;
}
config_file.writeAll("#endif\n") catch unreachable;
if (options.install_libs)
lib.install();
return lib;
}
fn ensureDependencySubmodule(allocator: std.mem.Allocator, path: []const u8) !void {
if (std.process.getEnvVarOwned(allocator, "NO_ENSURE_SUBMODULES")) |no_ensure_submodules| {
defer allocator.free(no_ensure_submodules);
if (std.mem.eql(u8, no_ensure_submodules, "true")) return;
} else |_| {}
var child = std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator);
child.cwd = (comptime thisDir());
child.stderr = std.io.getStdErr();
child.stdout = std.io.getStdOut();
_ = try child.spawnAndWait();
}
fn thisDir() []const u8 {
return std.fs.path.dirname(@src().file) orelse ".";
}
const soundio_sources = &[_][]const u8{
soundio_path ++ "/src/soundio.c",
soundio_path ++ "/src/util.c",
soundio_path ++ "/src/os.c",
soundio_path ++ "/src/dummy.c",
soundio_path ++ "/src/channel_layout.c",
soundio_path ++ "/src/ring_buffer.c",
};
};
}

2
libs/sysaudio/src/soundio.zig
View file

@ -80,7 +80,7 @@ pub const Device = struct {
const addr = @ptrToInt(&device.planar_buffer); const addr = @ptrToInt(&device.planar_buffer);
const aligned_addr = std.mem.alignForward(addr, @alignOf(f32)); const aligned_addr = std.mem.alignForward(addr, @alignOf(f32));
const padding = aligned_addr - addr; const padding = aligned_addr - addr;
const planar_buffer = device.planar_buffer[padding..padding + buffer_size]; const planar_buffer = device.planar_buffer[padding .. padding + buffer_size];
device.data_callback.?(device, device.user_data.?, planar_buffer); device.data_callback.?(device, device.user_data.?, planar_buffer);
var frames_left = total_frame_count; var frames_left = total_frame_count;

2
libs/sysaudio/src/webaudio.zig
View file

@ -117,7 +117,7 @@ pub fn requestDevice(audio: Audio, allocator: std.mem.Allocator, options: Device
_ = node.call("connect", &.{destination.toValue()}); _ = node.call("connect", &.{destination.toValue()});
} }
var properties = DeviceProperties { var properties = DeviceProperties{
.format = .F32, .format = .F32,
.mode = options.mode orelse .output, .mode = options.mode orelse .output,
.channels = options.channels orelse default_channel_count, .channels = options.channels orelse default_channel_count,