public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Janne Grunau <j@jannau.net>
To: git-commits@fedoraproject.org
Subject: [rpms/rust-speakersafetyd] rawhide: Update to 2.0.1; Fixes: RHBZ#2355911
Date: Thu, 23 Jul 2026 01:24:18 GMT [thread overview]
Message-ID: <178476985808.1.5981388975545239583.rpms-rust-speakersafetyd-ce97ff700de0@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rust-speakersafetyd
Branch : rawhide
Commit : ce97ff700de0edbb672fc93c209688335bd4e065
Author : Janne Grunau <j@jannau.net>
Date : 2026-07-22T23:56:35+00:00
Stats : +91/-29 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/rust-speakersafetyd/c/ce97ff700de0edbb672fc93c209688335bd4e065?branch=rawhide
Log:
Update to 2.0.1; Fixes: RHBZ#2355911
Add support for M3 series machines
---
diff --git a/.gitignore b/.gitignore
index c3c5d2c..f19d414 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/speakersafetyd-0.1.8.crate
/speakersafetyd-0.1.9.crate
/speakersafetyd-1.0.2.crate
+/speakersafetyd-2.0.1.crate
diff --git a/0001-j504-Write-the-full-speaker-names-in-conf.patch b/0001-j504-Write-the-full-speaker-names-in-conf.patch
new file mode 100644
index 0000000..16c5d2b
--- /dev/null
+++ b/0001-j504-Write-the-full-speaker-names-in-conf.patch
@@ -0,0 +1,72 @@
+From fd95fe3295d5c46897f7bcb003dd6bf8189be3cd Mon Sep 17 00:00:00 2001
+From: Janne Grunau <j@jannau.net>
+Date: Sun, 28 Jun 2026 21:49:22 +0200
+Subject: [PATCH 1/1] j504: Write the full speaker names in conf
+
+Fixes: fa6f1ca ("Add M3 generation devices")
+Signed-off-by: Janne Grunau <j@jannau.net>
+---
+ conf/apple/j504.conf | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/conf/apple/j504.conf b/conf/apple/j504.conf
+index 404f067..12d1d02 100644
+--- a/conf/apple/j504.conf
++++ b/conf/apple/j504.conf
+@@ -14,7 +14,7 @@ isense = ISENSE Switch
+ amp_gain = Amp Gain Volume
+ volume = Speaker Volume
+
+-[Speaker/W_L_1]
++[Speaker/Left Woofer 1]
+ group = 1
+ tr_coil = 28.09
+ tr_magnet = 34.43
+@@ -31,7 +31,7 @@ vs_scale = 14
+ is_chan = 0
+ vs_chan = 1
+
+-[Speaker/W_R_1]
++[Speaker/Right Woofer 1]
+ group = 1
+ tr_coil = 28.09
+ tr_magnet = 34.43
+@@ -48,7 +48,7 @@ vs_scale = 14
+ is_chan = 2
+ vs_chan = 3
+
+-[Speaker/W_L_2]
++[Speaker/Left Woofer 2]
+ group = 1
+ tr_coil = 28.09
+ tr_magnet = 34.43
+@@ -65,7 +65,7 @@ vs_scale = 14
+ is_chan = 4
+ vs_chan = 5
+
+-[Speaker/W_R_2]
++[Speaker/Right Woofer 2]
+ group = 1
+ tr_coil = 28.09
+ tr_magnet = 34.43
+@@ -82,7 +82,7 @@ vs_scale = 14
+ is_chan = 6
+ vs_chan = 7
+
+-[Speaker/T_L]
++[Speaker/Left Tweeter]
+ group = 0
+ tr_coil = 34.50
+ tr_magnet = 48.20
+@@ -99,7 +99,7 @@ vs_scale = 14
+ is_chan = 8
+ vs_chan = 9
+
+-[Speaker/T_R]
++[Speaker/Right Tweeter]
+ group = 0
+ tr_coil = 34.50
+ tr_magnet = 48.20
+--
+2.54.0
+
diff --git a/rust-speakersafetyd.spec b/rust-speakersafetyd.spec
index 4470291..4f2f5e5 100644
--- a/rust-speakersafetyd.spec
+++ b/rust-speakersafetyd.spec
@@ -4,7 +4,7 @@
%global crate speakersafetyd
Name: rust-speakersafetyd
-Version: 1.0.2
+Version: 2.0.1
Release: %autorelease
Summary: Speaker protection daemon for embedded Linux systems
@@ -12,13 +12,9 @@ License: MIT
URL: https://crates.io/crates/speakersafetyd
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
-# * relax alsa dependency to allow both v0.9 and v0.10:
-# https://github.com/AsahiLinux/speakersafetyd/issues/29
-# * relax simple_logger dependency to allow both v4 and v5:
-# https://github.com/AsahiLinux/speakersafetyd/pull/30
-# * relax clap-verbosity-flag dependency to allow both v2 and v3:
-# https://github.com/AsahiLinux/speakersafetyd/commit/687a240fc153a528a1979c3f3776fd9992cddb1a
Patch: speakersafetyd-fix-metadata.diff
+# backport https://github.com/AsahiLinux/speakersafetyd/pull/34 (j504 config fix)
+Patch: 0001-j504-Write-the-full-speaker-names-in-conf.patch
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: systemd-rpm-macros
diff --git a/rust2rpm.toml b/rust2rpm.toml
index a28d738..7eb8e52 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,8 +1,7 @@
[package]
cargo-toml-patch-comments = [
- "relax alsa dependency to allow both v0.9 and v0.10: https://github.com/AsahiLinux/speakersafetyd/issues/29",
- "relax simple_logger dependency to allow both v4 and v5: https://github.com/AsahiLinux/speakersafetyd/pull/30",
- "relax clap-verbosity-flag dependency to allow both v2 and v3: https://github.com/AsahiLinux/speakersafetyd/commit/687a240fc153a528a1979c3f3776fd9992cddb1a",
+ "relax alsa dependency to allow both v0.10 (fedora) and v0.11 (upstream): https://github.com/AsahiLinux/speakersafetyd/issues/29 and https://github.com/AsahiLinux/speakersafetyd/commit/d0848eb2ec1b1188167a82681d9ee18e75d5e071",
+ "relax signal-hook dependency to allow both v0.4.3 (fedora) and v0.4.4 (upstream): https://github.com/AsahiLinux/speakersafetyd/commit/9e1b7349140da5816e5308a58238892c2b594e87",
]
extra-files = [
"%{_datadir}/speakersafetyd/",
diff --git a/sources b/sources
index b1b282d..1f8d2ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (speakersafetyd-1.0.2.crate) = 4e370862d2d1da6e132d0833c4238f7dbba1f891bcb31301129f9e3408065d39cb78d109de04b4169a90011a6e6fa8f1a5f9181d700ab6db5465dcceef0369a5
+SHA512 (speakersafetyd-2.0.1.crate) = 6e7bbd5641b884d462fc49212de07b690037e3ed6a276d88101fbbc53efd0cc9f5666f6ac84a7d92c06fbf155484c2b27159b0dc87cd63d62acdbe93404f880e
diff --git a/speakersafetyd-fix-metadata.diff b/speakersafetyd-fix-metadata.diff
index c2f30ee..427e0eb 100644
--- a/speakersafetyd-fix-metadata.diff
+++ b/speakersafetyd-fix-metadata.diff
@@ -1,26 +1,20 @@
---- speakersafetyd-1.0.2/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ speakersafetyd-1.0.2/Cargo.toml 2026-06-13T07:00:08.855075+00:00
-@@ -28,7 +28,7 @@
+--- speakersafetyd-2.0.1/Cargo.toml 2006-07-24T01:21:28+00:00
++++ speakersafetyd-2.0.1/Cargo.toml 2026-06-28T18:51:27.430983+00:00
+@@ -29,7 +29,7 @@
path = "src/main.rs"
[dependencies.alsa]
--version = "^0.9.1"
-+version = ">=0.9.1,<0.11"
+-version = "^0.11.0"
++version = ">=0.10.0, <0.12"
[dependencies.chrono]
- version = "^0.4.31"
-@@ -38,7 +38,7 @@
- features = ["derive"]
+ version = "^0.4.44"
+@@ -52,7 +52,7 @@
+ version = "^0.4.29"
- [dependencies.clap-verbosity-flag]
--version = "^2.0.0"
-+version = ">=2.0.0, <4.0.0"
-
- [dependencies.configparser]
- version = "^3.1.0"
-@@ -57,4 +57,4 @@
- version = "^0.3.17"
+ [dependencies.signal-hook]
+-version = "^0.4.4"
++version = ">=0.4.3, <0.5"
[dependencies.simple_logger]
--version = "^4.3.3"
-+version = ">4.3.3, <6.0.0"
+ version = "^5.2.0"
reply other threads:[~2026-07-23 1:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178476985808.1.5981388975545239583.rpms-rust-speakersafetyd-ce97ff700de0@fedoraproject.org \
--to=j@jannau.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox