aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptrcnull <git@ptrcnull.me>2022-08-10 23:07:58 +0000
committerptrcnull <git@ptrcnull.me>2022-08-10 23:07:58 +0000
commit7bd59015df7b2e2367b580908ba33cec8ad7742b (patch)
tree42a708f25105d2b8f499ddd436797c0de24528e9
parent5e40e74bf9173ea8f6e2502d89e238add35566a9 (diff)
downloadaports-7bd59015df7b2e2367b580908ba33cec8ad7742b.tar.gz
aports-7bd59015df7b2e2367b580908ba33cec8ad7742b.tar.bz2
aports-7bd59015df7b2e2367b580908ba33cec8ad7742b.tar.xz
community/spot: clean up alsa backend references
fixes #14081
-rw-r--r--community/spot/APKBUILD4
-rw-r--r--community/spot/pulseaudio-backend-only.patch48
2 files changed, 42 insertions, 10 deletions
diff --git a/community/spot/APKBUILD b/community/spot/APKBUILD
index 6cc195b077..47f525d1b7 100644
--- a/community/spot/APKBUILD
+++ b/community/spot/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=spot
pkgver=0.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="Native Spotify client for the GNOME desktop"
url="https://github.com/xou816/spot"
arch="aarch64 armhf armv7 ppc64le x86 x86_64" # limited by rust/cargo
@@ -51,5 +51,5 @@ package() {
sha512sums="
8b116e5e9a79efbbb6aef21b89ca93d3ea6083fb02b245662a4e222f85feef76dbc5abcdacfb0a29bf8ee0d8062137b3f0a1648a47537b26a9c16dd7bf525a8a spot-0.3.3.tar.gz
-f790d51e5ce61f47b27c516931405a26270682066b00f807cf0f1427eabfff58b37a3c3627db1cfa53de13488f22429c410844205772020fbc27304f228fc4a1 pulseaudio-backend-only.patch
+209d7a9f8849f74135d618961bd81b53d389ae9bcbeb9e1fe04a4b8efcc466a6e26dc5d163a96eabc1c0816a8606e803cfa518a76e1e1bb03a6f473ba5f0577d pulseaudio-backend-only.patch
"
diff --git a/community/spot/pulseaudio-backend-only.patch b/community/spot/pulseaudio-backend-only.patch
index fa8081d2be..3559b4d189 100644
--- a/community/spot/pulseaudio-backend-only.patch
+++ b/community/spot/pulseaudio-backend-only.patch
@@ -6,9 +6,11 @@ PipeWire (the preferred audio server nowadays) provides PulseAudio API,
there's IMHO not much reason for building Spot with both PulseAudio and
ALSA backends.
+diff --git a/Cargo.toml b/Cargo.toml
+index eea8be7..696531a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -25,7 +25,8 @@
+@@ -22,7 +22,8 @@ features = ["v2_60"]
[dependencies.librespot]
version = "0.3.1"
@@ -17,7 +19,9 @@ ALSA backends.
+features = ["pulseaudio-backend"]
[dependencies.protobuf]
- version = "2.8.1"
+ version = "2.25.2"
+diff --git a/data/dev.alextren.Spot.gschema.xml b/data/dev.alextren.Spot.gschema.xml
+index 6a11f4f..8558125 100644
--- a/data/dev.alextren.Spot.gschema.xml
+++ b/data/dev.alextren.Spot.gschema.xml
@@ -2,7 +2,6 @@
@@ -28,14 +32,42 @@ ALSA backends.
</enum>
<enum id="dev.alextren.Spot.Bitrate">
<value value="0" nick="96"/>
-@@ -37,10 +36,6 @@
- <key name='audio-backend' enum='dev.alextren.Spot.AudioBackend'>
+@@ -34,10 +33,6 @@
<default>'pulseaudio'</default>
<summary>Audio backend</summary>
-- </key>
+ </key>
- <key name='alsa-device' type='s'>
- <default>'default'</default>
- <summary>Alsa device (if audio backend is 'alsa')</summary>
- </key>
- </schema>
- </schemalist>
+- </key>
+ <key name='ap-port' type='u'>
+ <default>0</default>
+ <summary>Port to communicate with Spotify's server (access point). Setting to 0 (default) allows Spot to use servers running on any port.</summary>
+diff --git a/src/app/components/settings/settings.rs b/src/app/components/settings/settings.rs
+index 63eb064..dc6919d 100644
+--- a/src/app/components/settings/settings.rs
++++ b/src/app/components/settings/settings.rs
+@@ -131,9 +131,6 @@ impl SettingsWindow {
+ })
+ .build();
+
+- let alsa_device = widget.alsa_device.downcast_ref::<gtk::Entry>().unwrap();
+- settings.bind("alsa-device", alsa_device, "text").build();
+-
+ let audio_backend = widget
+ .audio_backend
+ .downcast_ref::<libadwaita::ComboRow>()
+diff --git a/src/settings.rs b/src/settings.rs
+index a29621e..dd0cd6e 100644
+--- a/src/settings.rs
++++ b/src/settings.rs
+@@ -45,9 +45,6 @@ impl SpotifyPlayerSettings {
+ }?;
+ let backend = match settings.enum_("audio-backend") {
+ 0 => Some(AudioBackend::PulseAudio),
+- 1 => Some(AudioBackend::Alsa(
+- settings.string("alsa-device").as_str().to_string(),
+- )),
+ _ => None,
+ }?;
+ let ap_port_val = settings.uint("ap-port");