refactor: switch to static libportal

.github/workflows/release.yml

@@ -85,25 +85,25 @@ jobs:
       - name: Build Release Binaries
         run: nix develop -c zig build ${{ steps.version.outputs.release_build_args }} -Dappimage -Doptimize=ReleaseSafe
 
-      # - name: Package Linux
-      #   run: tar -czf spacecap-linux-x86_64.tar.gz -C zig-out linux
+      - name: Package Linux Binary
+        run: mv zig-out/linux/spacecap zig-out/linux/spacecap-linux-x86_64
 
       # - name: Package Windows
       #   run: zip -r spacecap-windows-x86_64.zip zig-out/windows
 
       - name: Generate Checksums
         run: |
-          # sha256sum spacecap-linux-x86_64.tar.gz > SHA256SUMS.txt
+          sha256sum zig-out/linux/spacecap-linux-x86_64 > SHA256SUMS.txt
           # sha256sum spacecap-windows-x86_64.zip >> SHA256SUMS.txt
           sha256sum zig-out/linux/spacecap-linux-x86_64.AppImage >> SHA256SUMS.txt
 
       - name: Upload Workflow Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: spacecap-release-assets
-          # spacecap-linux-x86_64.tar.gz is currently disabled.
           # spacecap-windows-x86_64.zip is currently disabled.
           path: |
+            zig-out/linux/spacecap-linux-x86_64
             zig-out/linux/spacecap-linux-x86_64.AppImage
             SHA256SUMS.txt
 
@@ -139,8 +139,8 @@ jobs:
           prerelease: ${{ steps.version.outputs.prerelease }}
           generate_release_notes: ${{ github.ref_type != 'tag' || steps.existing_release.outputs.exists != 'true' }}
           append_body: false
-          # spacecap-linux-x86_64.tar.gz is currently disabled.
           # spacecap-windows-x86_64.zip is currently disabled.
           files: |
+            zig-out/linux/spacecap-linux-x86_64
             zig-out/linux/spacecap-linux-x86_64.AppImage
             SHA256SUMS.txt

build.zig

@@ -100,10 +100,13 @@ fn add_linux_dependencies(
     // For Zig projects, add the `pipewire` module.
     exe.root_module.addImport("pipewire", pipewire.module("pipewire"));
 
-    exe.root_module.linkSystemLibrary("glib-2.0", .{});
-    exe.root_module.linkSystemLibrary("gio-2.0", .{});
-    exe.root_module.linkSystemLibrary("gobject-2.0", .{});
-    exe.root_module.linkSystemLibrary("portal", .{});
+    const libportal = b.dependency("libportal_zig", .{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe.root_module.addImport("libportal", libportal.module("libportal"));
+    exe.root_module.addObjectFile(libportal.namedLazyPath("portal"));
+
     exe.root_module.linkSystemLibrary("wayland-client", .{});
 
     // Vulkan is linked directly, because it is required that the

build.zig.zon

@@ -93,6 +93,10 @@
             .url = "git+https://github.com/mgerb/pipewire#80b7f695e14d2726ba59f2ad03cbc7cdd6066d12",
             .hash = "pipewire-1.6.3-tKslQ1aLAQAzbaWMWTqfvQKzzUaKx34CBpE6hWT4HRNY",
         },
+        .libportal_zig = .{
+            .url = "git+https://github.com/mgerb/libportal-zig#60f9de1ede1847d2c5cbc1c66a0fb71dada8921c",
+            .hash = "libportal_zig-0.10.0-G2meOw8fAACBQ9TE_YkpiSA6_5i1R5bvQWmX-pHJH8LR",
+        },
     },
 
     // Specifies the set of files and directories that are included in this package.

flake.nix

@@ -102,7 +102,6 @@
             vulkan-validation-layers
             vulkan-tools
             wayland
-            libportal
             zlib
             glib
 
@@ -135,7 +134,6 @@
             pkgs.gtk3
             pkgs.libayatana-appindicator
 
-            pkgs.libportal
             # SDL runtime backends (don't rely on ffmpeg closure for these).
             pkgs.wayland
             pkgs.libxkbcommon

src/capture/video/linux/pipewire/portal.zig

@@ -5,7 +5,7 @@ const TokenStorage = @import("../../../../common/linux/token_storage.zig");
 
 const log = std.log.scoped(.portal);
 
-const c = @import("../../../../tmp_bindings/libportal_bindings.zig");
+const c = @import("libportal");
 
 fn free_maybe(ptr: ?*anyopaque) void {
     if (ptr != null) {

src/file_picker/linux/xdg_desktop_portal_file_picker.zig

@@ -4,7 +4,7 @@ const TokenManager = @import("../../common/linux/token_manager.zig");
 const FilePicker = @import("../file_picker.zig").FilePicker;
 const FilePickerError = @import("../file_picker.zig").FilePickerError;
 
-const c = @import("../../tmp_bindings/gio_bindings.zig");
+const c = @import("libportal");
 
 const log = std.log.scoped(.xdg_desktop_portal_file_picker);
 

src/global_shortcuts/linux/xdg_desktop_portal_global_shortcuts.zig

@@ -6,7 +6,7 @@ const TokenStorage = @import("../../common/linux/token_storage.zig");
 const GlobalShortcuts = @import("../global_shortcuts.zig").GlobalShortcuts;
 const assert = std.debug.assert;
 
-const c = @import("../../tmp_bindings/gio_bindings.zig");
+const c = @import("libportal");
 
 const log = std.log.scoped(.xdg_desktop_portal_global_shortcuts);