pkg/libpng, pkg/zlib use package manager

pkg/zlib/build.old.zig

@@ -0,0 +1,74 @@
+const std = @import("std");
+
+/// Directories with our includes.
+const root = thisDir() ++ "../../../vendor/zlib/";
+const include_path = root;
+
+pub const include_paths = .{include_path};
+
+pub const pkg = std.build.Pkg{
+    .name = "zlib",
+    .source = .{ .path = thisDir() ++ "/main.zig" },
+};
+
+fn thisDir() []const u8 {
+    return std.fs.path.dirname(@src().file) orelse ".";
+}
+
+pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep) !*std.build.LibExeObjStep {
+    const lib = try buildLib(b, step);
+    step.linkLibrary(lib);
+    step.addIncludePath(.{ .path = include_path });
+    return lib;
+}
+
+pub fn buildLib(
+    b: *std.build.Builder,
+    step: *std.build.LibExeObjStep,
+) !*std.build.LibExeObjStep {
+    const lib = b.addStaticLibrary(.{
+        .name = "z",
+        .target = step.target,
+        .optimize = step.optimize,
+    });
+
+    // Include
+    lib.addIncludePath(.{ .path = include_path });
+
+    // Link
+    lib.linkLibC();
+
+    // Compile
+    var flags = std.ArrayList([]const u8).init(b.allocator);
+    defer flags.deinit();
+
+    try flags.appendSlice(&.{
+        "-DHAVE_SYS_TYPES_H",
+        "-DHAVE_STDINT_H",
+        "-DHAVE_STDDEF_H",
+        "-DZ_HAVE_UNISTD_H",
+    });
+
+    // C files
+    lib.addCSourceFiles(srcs, flags.items);
+
+    return lib;
+}
+
+const srcs = &.{
+    root ++ "adler32.c",
+    root ++ "compress.c",
+    root ++ "crc32.c",
+    root ++ "deflate.c",
+    root ++ "gzclose.c",
+    root ++ "gzlib.c",
+    root ++ "gzread.c",
+    root ++ "gzwrite.c",
+    root ++ "inflate.c",
+    root ++ "infback.c",
+    root ++ "inftrees.c",
+    root ++ "inffast.c",
+    root ++ "trees.c",
+    root ++ "uncompr.c",
+    root ++ "zutil.c",
+};

pkg/zlib/build.zig

@@ -1,74 +1,57 @@
 const std = @import("std");
 
-/// Directories with our includes.
-const root = thisDir() ++ "../../../vendor/zlib/";
-const include_path = root;
+pub fn build(b: *std.Build) !void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
 
-pub const include_paths = .{include_path};
+    const upstream = b.dependency("zlib", .{});
 
-pub const pkg = std.build.Pkg{
-    .name = "zlib",
-    .source = .{ .path = thisDir() ++ "/main.zig" },
-};
-
-fn thisDir() []const u8 {
-    return std.fs.path.dirname(@src().file) orelse ".";
-}
-
-pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep) !*std.build.LibExeObjStep {
-    const lib = try buildLib(b, step);
-    step.linkLibrary(lib);
-    step.addIncludePath(.{ .path = include_path });
-    return lib;
-}
-
-pub fn buildLib(
-    b: *std.build.Builder,
-    step: *std.build.LibExeObjStep,
-) !*std.build.LibExeObjStep {
     const lib = b.addStaticLibrary(.{
         .name = "z",
-        .target = step.target,
-        .optimize = step.optimize,
+        .target = target,
+        .optimize = optimize,
+    });
+    lib.linkLibC();
+    lib.addIncludePath(upstream.path(""));
+    lib.installHeadersDirectoryOptions(.{
+        .source_dir = upstream.path(""),
+        .install_dir = .header,
+        .install_subdir = "",
+        .include_extensions = &.{".h"},
     });
 
-    // Include
-    lib.addIncludePath(.{ .path = include_path });
-
-    // Link
-    lib.linkLibC();
-
-    // Compile
     var flags = std.ArrayList([]const u8).init(b.allocator);
     defer flags.deinit();
-
     try flags.appendSlice(&.{
         "-DHAVE_SYS_TYPES_H",
         "-DHAVE_STDINT_H",
         "-DHAVE_STDDEF_H",
         "-DZ_HAVE_UNISTD_H",
     });
+    for (srcs) |src| {
+        lib.addCSourceFile(.{
+            .file = upstream.path(src),
+            .flags = flags.items,
+        });
+    }
 
-    // C files
-    lib.addCSourceFiles(srcs, flags.items);
-
-    return lib;
+    b.installArtifact(lib);
 }
 
-const srcs = &.{
-    root ++ "adler32.c",
-    root ++ "compress.c",
-    root ++ "crc32.c",
-    root ++ "deflate.c",
-    root ++ "gzclose.c",
-    root ++ "gzlib.c",
-    root ++ "gzread.c",
-    root ++ "gzwrite.c",
-    root ++ "inflate.c",
-    root ++ "infback.c",
-    root ++ "inftrees.c",
-    root ++ "inffast.c",
-    root ++ "trees.c",
-    root ++ "uncompr.c",
-    root ++ "zutil.c",
+const srcs: []const []const u8 = &.{
+    "adler32.c",
+    "compress.c",
+    "crc32.c",
+    "deflate.c",
+    "gzclose.c",
+    "gzlib.c",
+    "gzread.c",
+    "gzwrite.c",
+    "inflate.c",
+    "infback.c",
+    "inftrees.c",
+    "inffast.c",
+    "trees.c",
+    "uncompr.c",
+    "zutil.c",
 };

pkg/zlib/build.zig.zon

@@ -0,0 +1,10 @@
+.{
+    .name = "zlib",
+    .version = "1.3.0",
+    .dependencies = .{
+        .zlib = .{
+            .url = "https://github.com/madler/zlib/archive/refs/tags/v1.3.tar.gz",
+            .hash = "12207d353609d95cee9da7891919e6d9582e97b7aa2831bd50f33bf523a582a08547",
+        },
+    },
+}