diff --git a/CHANGELOG.md b/CHANGELOG.md index 830f26ba..5d5519a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## [Unreleased] +## [v6.1.6] + +### Changed +- Disable skia bindings for UI again. It causes failures in build pipelines and requires extra dependencies. + ## [v6.1.5] ### Changed diff --git a/Cargo.lock b/Cargo.lock index 340f2ea7..9a3744d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -250,7 +250,7 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "asusctl" -version = "6.1.5" +version = "6.1.6" dependencies = [ "dmi_id", "env_logger", @@ -269,7 +269,7 @@ dependencies = [ [[package]] name = "asusd" -version = "6.1.5" +version = "6.1.6" dependencies = [ "cargo-husky", "concat-idents", @@ -296,7 +296,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "6.1.5" +version = "6.1.6" dependencies = [ "config-traits", "dirs", @@ -1084,7 +1084,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "6.1.5" +version = "6.1.6" dependencies = [ "log", "ron", @@ -1237,6 +1237,18 @@ dependencies = [ "libc", ] +[[package]] +name = "core-text" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" +dependencies = [ + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "foreign-types", + "libc", +] + [[package]] name = "core_maths" version = "0.1.1" @@ -1464,7 +1476,7 @@ dependencies = [ [[package]] name = "dmi_id" -version = "6.1.5" +version = "6.1.6" dependencies = [ "log", "udev 0.8.0", @@ -1482,19 +1494,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" -[[package]] -name = "drm" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" -dependencies = [ - "bitflags 2.8.0", - "bytemuck", - "drm-ffi 0.8.0", - "drm-fourcc", - "rustix", -] - [[package]] name = "drm" version = "0.14.1" @@ -1503,29 +1502,19 @@ checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f" dependencies = [ "bitflags 2.8.0", "bytemuck", - "drm-ffi 0.9.0", + "drm-ffi", "drm-fourcc", "libc", "rustix", ] -[[package]] -name = "drm-ffi" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" -dependencies = [ - "drm-sys 0.7.0", - "rustix", -] - [[package]] name = "drm-ffi" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b" dependencies = [ - "drm-sys 0.8.0", + "drm-sys", "rustix", ] @@ -1535,16 +1524,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" -[[package]] -name = "drm-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" -dependencies = [ - "libc", - "linux-raw-sys 0.6.5", -] - [[package]] name = "drm-sys" version = "0.8.0" @@ -1555,6 +1534,20 @@ dependencies = [ "linux-raw-sys 0.6.5", ] +[[package]] +name = "dwrote" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70182709525a3632b2ba96b6569225467b18ecb4a77f46d255f713a6bebf05fd" +dependencies = [ + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi", + "wio", +] + [[package]] name = "either" version = "1.13.0" @@ -1677,6 +1670,29 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "femtovg" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9bec3fb78abd18f7bbbde01f22f467c47c5a9c043e791802f82da0cf16066d1" +dependencies = [ + "bitflags 2.8.0", + "bytemuck", + "fnv", + "glow", + "image", + "imgref", + "log", + "lru", + "rgb", + "rustybuzz 0.20.1", + "slotmap", + "unicode-bidi", + "unicode-segmentation", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "field-offset" version = "0.3.6" @@ -1906,7 +1922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce852e998d3ca5e4a97014fb31c940dc5ef344ec7d364984525fd11e8a547e6a" dependencies = [ "bitflags 2.8.0", - "drm 0.14.1", + "drm", "drm-fourcc", "gbm-sys", "libc", @@ -2550,14 +2566,13 @@ version = "1.10.0" source = "git+https://github.com/slint-ui/slint.git#7c75720c9a0ba3d635380601471d1a5aa48ce1d3" dependencies = [ "calloop 0.14.2", - "drm 0.14.1", + "drm", "gbm", "glutin", "i-slint-common", "i-slint-core", - "i-slint-renderer-skia", + "i-slint-renderer-femtovg", "input", - "memmap2", "nix", "raw-window-handle", "xkbcommon", @@ -2574,7 +2589,6 @@ dependencies = [ "i-slint-common", "i-slint-core", "i-slint-core-macros", - "i-slint-renderer-skia", ] [[package]] @@ -2594,6 +2608,7 @@ dependencies = [ "i-slint-common", "i-slint-core", "i-slint-core-macros", + "i-slint-renderer-femtovg", "i-slint-renderer-skia", "lyon_path", "muda", @@ -2705,6 +2720,35 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "i-slint-renderer-femtovg" +version = "1.10.0" +source = "git+https://github.com/slint-ui/slint.git#7c75720c9a0ba3d635380601471d1a5aa48ce1d3" +dependencies = [ + "cfg-if", + "const-field-offset", + "core-foundation 0.9.4", + "core-text", + "derive_more", + "dwrote", + "femtovg", + "glow", + "i-slint-common", + "i-slint-core", + "i-slint-core-macros", + "imgref", + "lyon_path", + "pin-weak", + "rgb", + "scoped-tls-hkt", + "ttf-parser 0.25.1", + "unicode-script", + "unicode-segmentation", + "wasm-bindgen", + "web-sys", + "winapi", +] + [[package]] name = "i-slint-renderer-skia" version = "1.10.0" @@ -3370,6 +3414,12 @@ dependencies = [ "imgref", ] +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" + [[package]] name = "lyon_algorithms" version = "1.0.5" @@ -4693,7 +4743,7 @@ dependencies = [ [[package]] name = "rog-control-center" -version = "6.1.5" +version = "6.1.6" dependencies = [ "asusd", "concat-idents", @@ -4724,7 +4774,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "6.1.5" +version = "6.1.6" dependencies = [ "dmi_id", "gif 0.12.0", @@ -4738,7 +4788,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "6.1.5" +version = "6.1.6" dependencies = [ "dmi_id", "log", @@ -4749,7 +4799,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "6.1.5" +version = "6.1.6" dependencies = [ "asusd", "rog_anime", @@ -4763,7 +4813,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "6.1.5" +version = "6.1.6" dependencies = [ "concat-idents", "inotify", @@ -4776,7 +4826,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "6.1.5" +version = "6.1.6" dependencies = [ "log", "rog_platform", @@ -4787,7 +4837,7 @@ dependencies = [ [[package]] name = "rog_scsi" -version = "6.1.5" +version = "6.1.6" dependencies = [ "ron", "serde", @@ -4797,7 +4847,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "6.1.5" +version = "6.1.6" dependencies = [ "log", "rog_anime", @@ -4807,7 +4857,7 @@ dependencies = [ [[package]] name = "rog_slash" -version = "6.1.5" +version = "6.1.6" dependencies = [ "dmi_id", "serde", @@ -4912,8 +4962,26 @@ dependencies = [ "log", "smallvec", "ttf-parser 0.24.1", - "unicode-bidi-mirroring", - "unicode-ccc", + "unicode-bidi-mirroring 0.3.0", + "unicode-ccc 0.3.0", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702" +dependencies = [ + "bitflags 2.8.0", + "bytemuck", + "core_maths", + "log", + "smallvec", + "ttf-parser 0.25.1", + "unicode-bidi-mirroring 0.4.0", + "unicode-ccc 0.4.0", "unicode-properties", "unicode-script", ] @@ -5167,6 +5235,7 @@ dependencies = [ "i-slint-backend-selector", "i-slint-core", "i-slint-core-macros", + "i-slint-renderer-femtovg", "num-traits", "once_cell", "pin-weak", @@ -5304,7 +5373,6 @@ dependencies = [ "bytemuck", "cfg_aliases", "core-graphics 0.24.0", - "drm 0.12.0", "fastrand", "foreign-types", "js-sys", @@ -5910,6 +5978,9 @@ name = "ttf-parser" version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" +dependencies = [ + "core_maths", +] [[package]] name = "typed-index-collections" @@ -5994,12 +6065,24 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" +[[package]] +name = "unicode-bidi-mirroring" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfa6e8c60bb66d49db113e0125ee8711b7647b5579dc7f5f19c42357ed039fe" + [[package]] name = "unicode-ccc" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" +[[package]] +name = "unicode-ccc" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e" + [[package]] name = "unicode-ident" version = "1.0.16" @@ -6068,7 +6151,7 @@ dependencies = [ "log", "pico-args", "roxmltree", - "rustybuzz", + "rustybuzz 0.18.0", "simplecss", "siphasher", "strict-num", @@ -6930,6 +7013,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + [[package]] name = "wit-bindgen-rt" version = "0.33.0" diff --git a/Cargo.toml b/Cargo.toml index 7309f68e..5a5d5fe5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "6.1.5" +version = "6.1.6" rust-version = "1.82" license = "MPL-2.0" readme = "README.md" diff --git a/rog-control-center/Cargo.toml b/rog-control-center/Cargo.toml index fd70151f..40225543 100644 --- a/rog-control-center/Cargo.toml +++ b/rog-control-center/Cargo.toml @@ -53,8 +53,8 @@ features = [ "gettext", "accessibility", "backend-winit-wayland", - # "renderer-femtovg", - "renderer-skia-opengl", + "renderer-femtovg", + # "renderer-skia-opengl", ] [build-dependencies.slint-build] diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index aba97947..b410d76a 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: 2025-02-15 22:46+0000\n" +"POT-Creation-Date: 2025-02-15 22:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"