diff --git a/CHANGELOG.md b/CHANGELOG.md index afbe3ae4..e40a47ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,13 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v6.0.7] + ### Changed - Add a config option to set if throttle policy is changed on ac/bat change (UI only) -- Allow X11 GUI. This is *not* supported. +- Allow X11 GUI. This is *not* supported. Please see readme. - Fixes to some GUI widget layouts and sizing - Do a backup HID raw write fro brightness if the read-back value does not match. This is a temporary solve for some G14 and G16 until the kernel patch is ready. -- Reimplement the older 0x1866 MCU keyboard control power bits plus UI control for it +- Reimplement the older 0x1866 MCU keyboard control power bits plus UI control for it. If you had a keyboard affected by Lightbar issues and it is older than a couple of years this should help. If not, please file a bug. ## [v6.0.6] diff --git a/Cargo.toml b/Cargo.toml index 69c139d0..5a32d3ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,7 @@ description = "Laptop feature control for ASUS ROG laptops and others" edition = "2021" [workspace] +resolver = "2" members = [ "asusctl", "asusd", @@ -33,7 +34,6 @@ default-members = [ "cpuctl", "rog-control-center", ] -resolver = "2" [workspace.dependencies] tokio = { version = "^1.36.0", default-features = false, features = [ diff --git a/README.md b/README.md index 8fa3eb27..ad9a538e 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,10 @@ Now includes a GUI, `rog-control-center`. Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t) +## X11 support + +X11 is not supported at all, as in I will not help you with X11 issues if there are any due to limited time and it being unmaintained itself. You can however build `rog-control-center` with it enabled `cargo build --features "rog-control-center/x11"`. + ## Goals The main goal of this work is to provide a safe and easy to use abstraction over various laptop features via DBUS, and to provide some helpful defaults and other behaviour such as toggling throttle/profile on AC/battery change. diff --git a/asusd-user/Cargo.toml b/asusd-user/Cargo.toml index 07e019b4..70777d50 100644 --- a/asusd-user/Cargo.toml +++ b/asusd-user/Cargo.toml @@ -12,6 +12,10 @@ edition.workspace = true name = "asusd-user" path = "src/daemon.rs" +[features] +default = [] +local_data = [] + [dependencies] dirs.workspace = true smol.workspace = true diff --git a/asusd/src/ctrl_aura/mod.rs b/asusd/src/ctrl_aura/mod.rs index 912af9e1..eeaed390 100644 --- a/asusd/src/ctrl_aura/mod.rs +++ b/asusd/src/ctrl_aura/mod.rs @@ -26,7 +26,7 @@ pub(super) fn filename_partial(parent: &Device) -> Option { }; if path.contains('.') { warn!("dbus path for {id_product} contains `.`, removing"); - path = path.replace('.', "").to_owned(); + path.replace('.', "").clone_into(&mut path); } return Some(ObjectPath::from_str_unchecked(&path).into()); } diff --git a/distro-packaging/asusctl.spec b/distro-packaging/asusctl.spec index 0949fd3e..312fd242 100755 --- a/distro-packaging/asusctl.spec +++ b/distro-packaging/asusctl.spec @@ -20,13 +20,14 @@ %global debug_package %{nil} %endif -%global rpm_dkms_opt 1 +%define specrelease %{?dist} +%define pkg_release 3%{specrelease} # Use hardening ldflags. %global rustflags -Clink-arg=-Wl,-z,relro,-z,now Name: asusctl -Version: 4.7.0 -Release: 2 +Version: 6.0.7 +Release: %{pkg_release} Summary: Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks License: MPLv2 @@ -34,8 +35,8 @@ Group: System Environment/Kernel URL: https://gitlab.com/asus-linux/asusctl Source: %{name}-%{version}.tar.gz -Source1: vendor-%{name}-%{version}.tar.gz -Source2: cargo_config +Source1: vendor_%{name}_%{version}.tar.xz +Source2: cargo-config BuildRequires: cargo BuildRequires: rust-packaging @@ -44,12 +45,20 @@ BuildRequires: clang-devel 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) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gdk-3.0) BuildRequires: desktop-file-utils -Requires: libappindicator-gtk3 + +# expat-devel pcre2-devel %description asus-nb-ctrl is a utility for Linux to control many aspects of various @@ -67,9 +76,10 @@ A one-stop-shop GUI tool for asusd/asusctl. It aims to provide most controls, a notification service, and ability to run in the background. %prep +# %setup -D -T -a 1 -c -n %{name}-%{version}/vendor +# %setup -D -T -a 0 -c %autosetup -%setup -D -T -a 1 -c -n %{name}-%{version}/vendor -cd .. +%setup -D -T -a 1 mv Cargo.lock{,.bak} %cargo_prep @@ -86,7 +96,7 @@ export RUSTFLAGS="%{rustflags}" export RUSTFLAGS="%{rustflags}" mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}" %make_install - + install -D -m 0644 README.md %{buildroot}/%{_docdir}/%{name}/README.md install -D -m 0644 rog-anime/README.md %{buildroot}/%{_docdir}/%{name}/README-anime.md install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}/%{_docdir}/%{name}/diagonal-template.png diff --git a/rog-control-center/Cargo.toml b/rog-control-center/Cargo.toml index d6e1ac68..48be1498 100644 --- a/rog-control-center/Cargo.toml +++ b/rog-control-center/Cargo.toml @@ -9,8 +9,8 @@ homepage.workspace = true edition.workspace = true [features] -#default = ["mocking"] -#mocking = [] +default = [] +mocking = [] x11 = ["slint/backend-winit-x11"] [dependencies] diff --git a/rog-control-center/README.md b/rog-control-center/README.md index 95035be3..4804c6a3 100644 --- a/rog-control-center/README.md +++ b/rog-control-center/README.md @@ -1,5 +1,9 @@ # ROGALOG +## X11 support + +X11 is not supported at all, as in I will not help you with X11 issues if there are any due to limited time and it being unmaintained itself. You can however build `rog-control-center` with it enabled `cargo build --features x11`. + ### Translations You can help with translations by following https://slint.dev/releases/1.1.0/docs/slint/src/concepts/translations#translate-the-strings @@ -8,4 +12,4 @@ Begin by copying `rog-control-center/translations/en/rog-control-center.po` to ` Run `msgfmt rog-control-center/translations//rog-control-center.po -o rog-control-center/translations//LC_MESSAGES/rog-control-center.mo` to make the binary formatted translation where `` is changed to your translation locale. -To test you local translations run `RUST_TRANSLATIONS=1 rog-control-center`. \ No newline at end of file +To test you local translations run `RUST_TRANSLATIONS=1 rog-control-center`. diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index 0cbaaeb6..02407a35 100644 --- a/rog-control-center/translations/en/rog-control-center.po +++ b/rog-control-center/translations/en/rog-control-center.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-05-13 11:53+0000\n" +"POT-Creation-Date: 2024-05-14 05:08+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -417,12 +417,12 @@ msgctxt "Aura power zone" msgid "Logo" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:50 +#: rog-control-center/ui/types/aura_types.slint:50 rog-control-center/ui/types/aura_types.slint:59 msgctxt "Aura power zone" msgid "Keyboard" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:51 +#: rog-control-center/ui/types/aura_types.slint:51 rog-control-center/ui/types/aura_types.slint:60 msgctxt "Aura power zone" msgid "Lightbar" msgstr "" @@ -437,167 +437,167 @@ msgctxt "Aura power zone" msgid "Rear Glow" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:54 +#: rog-control-center/ui/types/aura_types.slint:54 rog-control-center/ui/types/aura_types.slint:61 msgctxt "Aura power zone" msgid "Keyboard and Lightbar" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:57 +#: rog-control-center/ui/types/aura_types.slint:64 msgctxt "Aura brightness" msgid "Off" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:58 +#: rog-control-center/ui/types/aura_types.slint:65 msgctxt "Aura brightness" msgid "Low" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:59 +#: rog-control-center/ui/types/aura_types.slint:66 msgctxt "Aura brightness" msgid "Med" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:60 +#: rog-control-center/ui/types/aura_types.slint:67 msgctxt "Aura brightness" msgid "High" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:65 rog-control-center/ui/types/aura_types.slint:80 +#: rog-control-center/ui/types/aura_types.slint:72 rog-control-center/ui/types/aura_types.slint:87 msgctxt "Basic aura mode" msgid "Static" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:66 rog-control-center/ui/types/aura_types.slint:81 +#: rog-control-center/ui/types/aura_types.slint:73 rog-control-center/ui/types/aura_types.slint:88 msgctxt "Basic aura mode" msgid "Breathe" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:67 rog-control-center/ui/types/aura_types.slint:82 +#: rog-control-center/ui/types/aura_types.slint:74 rog-control-center/ui/types/aura_types.slint:89 msgctxt "Basic aura mode" msgid "Strobe" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:68 +#: rog-control-center/ui/types/aura_types.slint:75 msgctxt "Basic aura mode" msgid "Rainbow" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:69 +#: rog-control-center/ui/types/aura_types.slint:76 msgctxt "Basic aura mode" msgid "Star" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:70 +#: rog-control-center/ui/types/aura_types.slint:77 msgctxt "Basic aura mode" msgid "Rain" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:71 +#: rog-control-center/ui/types/aura_types.slint:78 msgctxt "Basic aura mode" msgid "Highlight" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:72 +#: rog-control-center/ui/types/aura_types.slint:79 msgctxt "Basic aura mode" msgid "Laser" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:73 +#: rog-control-center/ui/types/aura_types.slint:80 msgctxt "Basic aura mode" msgid "Ripple" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:74 +#: rog-control-center/ui/types/aura_types.slint:81 msgctxt "Basic aura mode" msgid "Nothing" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:75 +#: rog-control-center/ui/types/aura_types.slint:82 msgctxt "Basic aura mode" msgid "Pulse" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:76 +#: rog-control-center/ui/types/aura_types.slint:83 msgctxt "Basic aura mode" msgid "Comet" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:77 +#: rog-control-center/ui/types/aura_types.slint:84 msgctxt "Basic aura mode" msgid "Flash" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:89 +#: rog-control-center/ui/types/aura_types.slint:96 msgctxt "Aura zone" msgid "None" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:90 +#: rog-control-center/ui/types/aura_types.slint:97 msgctxt "Aura zone" msgid "Key1" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:91 +#: rog-control-center/ui/types/aura_types.slint:98 msgctxt "Aura zone" msgid "Key2" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:92 +#: rog-control-center/ui/types/aura_types.slint:99 msgctxt "Aura zone" msgid "Key3" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:93 +#: rog-control-center/ui/types/aura_types.slint:100 msgctxt "Aura zone" msgid "Key4" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:94 +#: rog-control-center/ui/types/aura_types.slint:101 msgctxt "Aura zone" msgid "Logo" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:95 +#: rog-control-center/ui/types/aura_types.slint:102 msgctxt "Aura zone" msgid "Lightbar Left" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:96 +#: rog-control-center/ui/types/aura_types.slint:103 msgctxt "Aura zone" msgid "Lightbar Right" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:100 +#: rog-control-center/ui/types/aura_types.slint:107 msgctxt "Aura direction" msgid "Right" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:101 +#: rog-control-center/ui/types/aura_types.slint:108 msgctxt "Aura direction" msgid "Left" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:102 +#: rog-control-center/ui/types/aura_types.slint:109 msgctxt "Aura direction" msgid "Up" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:103 +#: rog-control-center/ui/types/aura_types.slint:110 msgctxt "Aura direction" msgid "Down" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:107 +#: rog-control-center/ui/types/aura_types.slint:114 msgctxt "Aura speed" msgid "Low" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:108 +#: rog-control-center/ui/types/aura_types.slint:115 msgctxt "Aura speed" msgid "Medium" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:109 +#: rog-control-center/ui/types/aura_types.slint:116 msgctxt "Aura speed" msgid "High" msgstr ""