From a672a86cc468a372dafd19bef8e46dcdb52eea6c Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Sat, 2 Nov 2024 13:17:42 +0100 Subject: [PATCH] rog-control-center: Disable slint KMS backend The slint KMS backend is meant to run an application without a display server and with direct, exclusive display and input control, which is a very specific use-case for e.g. embedded applications. Disable the KMS backend and avoid a bunch of dependencies. --- .gitlab-ci.yml | 2 +- Cargo.lock | 23 +---------------------- README.md | 6 +++--- distro-packaging/asusctl.spec | 4 ---- rog-control-center/Cargo.toml | 1 - 5 files changed, 5 insertions(+), 31 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b15fe71..198cba7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ image: rust:latest - target/release/.cargo-lock before_script: - - apt-get update -qq && apt-get install -y -qq libinput-dev libseat-dev libudev-dev libgtk-3-dev grep llvm clang libclang-dev libsdl2-dev libsdl2-gfx-dev + - apt-get update -qq && apt-get install -y -qq libudev-dev libgtk-3-dev grep llvm clang libclang-dev libsdl2-dev libsdl2-gfx-dev stages: - format diff --git a/Cargo.lock b/Cargo.lock index 13906906..b4dcdf61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ab_glyph" @@ -2146,7 +2146,6 @@ dependencies = [ "i-slint-core", "i-slint-renderer-femtovg", "input", - "libseat", "nix 0.27.1", "raw-window-handle", "xkbcommon", @@ -2692,26 +2691,6 @@ dependencies = [ "redox_syscall 0.5.3", ] -[[package]] -name = "libseat" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a0adf8d8607a73a5b74cbe4132f57cb349e4bf860103cd089461bbcbc9907e" -dependencies = [ - "errno", - "libseat-sys", - "log", -] - -[[package]] -name = "libseat-sys" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3671cb5e03871f1d6bf0b3b5daa9275549e348fa6359e0f9adb910ca163d4c34" -dependencies = [ - "pkg-config", -] - [[package]] name = "libudev-sys" version = "0.1.4" diff --git a/README.md b/README.md index ea617f9d..09f0c397 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ Rust and cargo are required, they can be installed from [rustup.rs](https://rust **fedora:** - dnf install cmake clang-devel libinput-devel libseat-devel libgbm-devel libxkbcommon-devel systemd-devel libdrm-devel expat-devel pcre2-devel libzstd-devel gtk3-devel + dnf install cmake clang-devel libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel make sudo make install @@ -93,7 +93,7 @@ Rust and cargo are required, they can be installed from [rustup.rs](https://rust Works with KDE Plasma (without GTK packages) zypper in -t pattern devel_basis - zypper in rustup make cmake clang-devel libinput-devel libseat-devel libgbm-devel libxkbcommon-devel systemd-devel libdrm-devel expat-devel pcre2-devel libzstd-devel gtk3-devel + zypper in rustup make cmake clang-devel libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel make sudo make install @@ -101,7 +101,7 @@ Works with KDE Plasma (without GTK packages) officially unsuported,but you can still try and test it by yourself(some features may not be available). - sudo apt install libclang-dev libudev-dev libfontconfig-dev build-essential cmake libseat-dev libxkbcommon-dev libinput-dev libgbm-dev + sudo apt install libclang-dev libudev-dev libfontconfig-dev build-essential cmake libxkbcommon-dev curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh make sudo make install diff --git a/distro-packaging/asusctl.spec b/distro-packaging/asusctl.spec index 312fd242..bf448db6 100755 --- a/distro-packaging/asusctl.spec +++ b/distro-packaging/asusctl.spec @@ -46,11 +46,7 @@ BuildRequires: cmake BuildRequires: rust BuildRequires: rust-std-static BuildRequires: pkgconfig(expat) -BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(libinput) -BuildRequires: pkgconfig(libseat) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(libzstd) diff --git a/rog-control-center/Cargo.toml b/rog-control-center/Cargo.toml index 6a990d66..de81f9f5 100644 --- a/rog-control-center/Cargo.toml +++ b/rog-control-center/Cargo.toml @@ -51,7 +51,6 @@ default-features = false features = [ "gettext", "compat-1-2", - "backend-linuxkms", "backend-winit-wayland", "renderer-winit-femtovg", # "renderer-skia-opengl",