feat: add alternative headless and libadwaita builds

.github/workflows/build-packages.yaml

@@ -9,7 +9,13 @@ jobs:
   build-packages:
     strategy:
       matrix:
-        target-os: [debian-12, ubuntu-2204, fedora-38, fedora-39, arch]
+        target-os: [ debian-12, ubuntu-2204, fedora-38, fedora-39, arch ]
+        recipe: [ lact, lact-headless ]
+        include:
+          - target-os: fedora-39
+            recipe: lact-libadwaita
+          - target-os: arch
+            recipe: lact-libadwaita
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -19,9 +25,9 @@ jobs:
         run: |
           curl -L -o /tmp/pkger.deb https://github.com/vv9k/pkger/releases/download/0.11.0/pkger-0.11.0-0.amd64.deb
           sudo apt -y install /tmp/pkger.deb
-
+          
       - name: Build packages
-        run: pkger -c .pkger.yml build lact -i ${{ matrix.target-os }}
+        run: pkger -c .pkger.yml build ${{ matrix.recipe }} -i ${{ matrix.target-os }}
 
       - name: Copy release files
         run: |

Makefile

@@ -3,7 +3,13 @@ DESTDIR ?= /
 PREFIX ?= /usr/local
 
 build-release:
-	cargo build --release
+	cargo build -p lact --release
+
+build-release-libadwaita:
+	cargo build -p lact --release --features=adw
+
+build-release-headless:
+	cargo build -p lact --release --no-default-features --features=drm
 
 install:
 	install -Dm755 target/release/lact $(DESTDIR)$(PREFIX)/bin/lact

README.md

@@ -93,6 +93,11 @@ Minimal build (no GUI!):
 cargo build --no-default-features -p lact
 ```
 
+Build GUI with libadwaita support:
+```
+make build-release-libadwaita
+```
+
 # API
 
 There is an API available over a unix socket. See [here](API.md) for more information.

lact-gui/Cargo.toml

@@ -15,6 +15,9 @@ gtk = { version = "0.7", package = "gtk4", features = ["v4_6", "blueprint"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 anyhow = "1.0"
+adw = { package = "libadwaita", version = "0.5.3", features = [
+    "v1_4",
+], optional = true }
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"

lact-gui/src/app/mod.rs

@@ -37,6 +37,10 @@ pub struct App {
 
 impl App {
     pub fn new(daemon_client: DaemonClient) -> Self {
+        #[cfg(feature = "adw")]
+        let application: Application =
+            adw::Application::new(Some(APP_ID), ApplicationFlags::default()).upcast();
+        #[cfg(not(feature = "adw"))]
         let application = Application::new(Some(APP_ID), ApplicationFlags::default());
 
         let header = Header::new();

lact/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 [features]
 default = ["lact-gui", "drm"]
 drm = ["lact-daemon/drm"]
+adw = ["lact-gui/adw"]
 
 [dependencies]
 lact-daemon = { path = "../lact-daemon", default-features = false }

pkg/recipes/lact-headless/recipe.yml

@@ -0,0 +1,36 @@
+metadata:
+  name: lact-headless
+  description: AMDGPU control utility
+  arch: x86_64
+  license: MIT
+  version: 0.5.1
+  maintainer: ilya-zlobintsev
+  url: https://github.com/ilya-zlobintsev/lact
+  source:
+    - '../../..'
+  provides: [ lact ]
+  conflicts: [ lact, lact-libadwaita ]
+  depends:
+    all: [ hwdata ]
+    debian-12+ubuntu-2204: [ libdrm-amdgpu1 ]
+    fedora-38+fedora-39: [ libdrm ]
+    arch: [ libdrm ]
+  build_depends:
+    all: [ curl, make, dbus, clang ]
+    debian-12+ubuntu-2204: [ pkg-config, build-essential, libdrm-dev ]
+    fedora-38+fedora-39: [ gcc, libdrm-devel ]
+    arch: [ libdrm ]
+  all_images: true
+env:
+  RUSTUP_URL: https://sh.rustup.rs
+configure:
+  steps:
+    - cmd: curl -o /tmp/install_rust.sh $RUSTUP_URL
+    - cmd: sh /tmp/install_rust.sh -y --default-toolchain stable
+build:
+  steps:
+    - cmd: bash -c "source $HOME/.cargo/env && make build-release-headless"
+install:
+  steps:
+    - cmd: bash -c "cd $PKGER_BLD_DIR && DESTDIR=$PKGER_OUT_DIR PREFIX=/usr make install"
+

pkg/recipes/lact-libadwaita/recipe.yml

@@ -0,0 +1,38 @@
+metadata:
+  name: lact-libadwaita
+  description: AMDGPU control utility
+  arch: x86_64
+  license: MIT
+  version: 0.5.1
+  maintainer: ilya-zlobintsev
+  url: https://github.com/ilya-zlobintsev/lact
+  source:
+    - '../../..'
+  provides: [ lact ]
+  conflicts: [ lact, lact-headless ]
+  depends:
+    all: [ hwdata ]
+    fedora-39: [ gtk4, libdrm, libadwaita ]
+    arch: [ gtk4, libadwaita ]
+  build_depends:
+    all: [ curl, make, dbus, clang ]
+    fedora-39: [ gtk4-devel, gcc, libdrm-devel, blueprint-compiler, libadwaita-devel ]
+    arch: [ gtk4, blueprint-compiler, libadwaita ]
+  all_images: true
+env:
+  RUSTUP_URL: https://sh.rustup.rs
+configure:
+  steps:
+    - cmd: curl -o /tmp/install_rust.sh $RUSTUP_URL
+    - cmd: sh /tmp/install_rust.sh -y --default-toolchain stable
+    - cmd: >-
+        curl -o /tmp/blueprint-compiler.deb http://de.archive.ubuntu.com/ubuntu/pool/universe/b/blueprint-compiler/blueprint-compiler_0.10.0-3_all.deb &&
+        apt install -y /tmp/blueprint-compiler.deb
+      deb: true
+build:
+  steps:
+    - cmd: bash -c "source $HOME/.cargo/env && make build-release-libadwaita"
+install:
+  steps:
+    - cmd: bash -c "cd $PKGER_BLD_DIR && DESTDIR=$PKGER_OUT_DIR PREFIX=/usr make install"
+

pkg/recipes/lact/recipe.yml

@@ -9,6 +9,7 @@ metadata:
   source:
     - '../../..'
   provides: [ lact ]
+  conflicts: [ lact-headless, lact-libadwaita ]
   depends:
     all: [ hwdata ]
     debian-12+ubuntu-2204: [ libgtk-4-1 ]
@@ -32,7 +33,7 @@ configure:
       deb: true
 build:
   steps:
-    - cmd: bash -c "source $HOME/.cargo/env && make"
+    - cmd: bash -c "source $HOME/.cargo/env && make build-release"
 install:
   steps:
     - cmd: bash -c "cd $PKGER_BLD_DIR && DESTDIR=$PKGER_OUT_DIR PREFIX=/usr make install"