glfw: update to zig latest master branch #116

Closed

BratishkaErik wants to merge 2 commits from BratishkaErik-patch-1 into main

BratishkaErik commented

2021-12-06 11:36:42 +00:00

(Migrated from github.com)

By selecting this checkbox, I agree to license my contributions to this project under the license(s) described in the LICENSE file, and I have the right to do so or have received permission to do so by an employer or client I am producing work for whom has this right.

Microfix for this:

./deps/mach/glfw/system_sdk.zig:95:38: error: expected type '*std.mem.Allocator', found 'std.mem.Allocator'
    const sdk_root_dir = getSdkRoot(b.allocator, options.github_org, options.linux_x86_64, options.linux_x86_64_revision) catch unreachable;
                                     ^
/usr/lib/zig/std/mem/Allocator.zig:1:1: note: std.mem.Allocator declared here
//! The standard memory allocation interface.
^
./deps/mach/glfw/system_sdk.zig:72:38: error: expected type '*std.mem.Allocator', found 'std.mem.Allocator'
    const sdk_root_dir = getSdkRoot(b.allocator, options.github_org, sdk_name, sdk_revision) catch unreachable;
                                     ^
/usr/lib/zig/std/mem/Allocator.zig:1:1: note: std.mem.Allocator declared here
//! The standard memory allocation interface.
^
./deps/mach/glfw/system_sdk.zig:123:36: error: expected type 'std.mem.Allocator', found '*std.mem.Allocator'
    if (std.process.getEnvVarOwned(allocator, "SDK_PATH")) |sdk_path| {
                                   ^
/usr/lib/zig/std/mem/Allocator.zig:1:1: note: std.mem.Allocator declared here
//! The standard memory allocation interface.

See https://github.com/ziglang/zig/pull/10055

- [X] By selecting this checkbox, I agree to license my contributions to this project under the license(s) described in the LICENSE file, and I have the right to do so or have received permission to do so by an employer or client I am producing work for whom has this right. Microfix for this: ``` ./deps/mach/glfw/system_sdk.zig:95:38: error: expected type '*std.mem.Allocator', found 'std.mem.Allocator' const sdk_root_dir = getSdkRoot(b.allocator, options.github_org, options.linux_x86_64, options.linux_x86_64_revision) catch unreachable; ^ /usr/lib/zig/std/mem/Allocator.zig:1:1: note: std.mem.Allocator declared here //! The standard memory allocation interface. ^ ./deps/mach/glfw/system_sdk.zig:72:38: error: expected type '*std.mem.Allocator', found 'std.mem.Allocator' const sdk_root_dir = getSdkRoot(b.allocator, options.github_org, sdk_name, sdk_revision) catch unreachable; ^ /usr/lib/zig/std/mem/Allocator.zig:1:1: note: std.mem.Allocator declared here //! The standard memory allocation interface. ^ ./deps/mach/glfw/system_sdk.zig:123:36: error: expected type 'std.mem.Allocator', found '*std.mem.Allocator' if (std.process.getEnvVarOwned(allocator, "SDK_PATH")) |sdk_path| { ^ /usr/lib/zig/std/mem/Allocator.zig:1:1: note: std.mem.Allocator declared here //! The standard memory allocation interface. ``` See https://github.com/ziglang/zig/pull/10055

👍 1

InKryption commented

2021-12-06 13:45:12 +00:00

(Migrated from github.com)

You could also go in and do the same in 'glfw/src/Image.zig', 'glfw/src/GammaRamp.zig', 'glfw/src/Window.zig', 'glfw/src/Monitor.zig', and I think 'glfw/src/Cursor.zig'.

InKryption commented

2021-12-06 15:47:15 +00:00

(Migrated from github.com)

btw, for future reference, the practice is to prefix issues and pull requests related specifically to the mach-glfw subtree with 'glfw:', both in commits and titles. Slimsag will probably squash the commits here and have it prefixed appropriately though, so no real issues here.

BratishkaErik commented

2021-12-06 15:53:48 +00:00

(Migrated from github.com)

OK, I'll make a note of that.

👍 1

emidoots (Migrated from github.com) approved these changes

2021-12-07 01:15:57 +00:00

emidoots (Migrated from github.com) left a comment

Beautiful, thank you!