From 581c8d61eac252b23375555417708a3ba90e15e2 Mon Sep 17 00:00:00 2001
From: humaita-github <68893003+humaita-github@users.noreply.github.com>
Date: Fri, 14 Feb 2025 20:16:29 +0100
Subject: [PATCH] Replacing atomic_shim with portable-atomic, since atomic_shim
 worsk well for MIPS and MIPSEL, but has problem with some ARM flavours.
 (#1466)

---
 Cargo.lock                      | 11 +----------
 playback/Cargo.toml             |  2 +-
 playback/src/mixer/softmixer.rs |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9402e6c64..4bf542432 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -169,15 +169,6 @@ dependencies = [
  "syn 2.0.96",
 ]
 
-[[package]]
-name = "atomic-shim"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -2142,7 +2133,6 @@ name = "librespot-playback"
 version = "0.6.0-dev"
 dependencies = [
  "alsa",
- "atomic-shim",
  "cpal",
  "futures-util",
  "glib",
@@ -2158,6 +2148,7 @@ dependencies = [
  "log",
  "ogg",
  "parking_lot",
+ "portable-atomic",
  "portaudio-rs",
  "rand",
  "rand_distr",
diff --git a/playback/Cargo.toml b/playback/Cargo.toml
index ba1b5ad88..bd53c35ba 100644
--- a/playback/Cargo.toml
+++ b/playback/Cargo.toml
@@ -21,7 +21,7 @@ path = "../metadata"
 version = "0.6.0-dev"
 
 [dependencies]
-atomic-shim = "0.2.0"
+portable-atomic = "1"
 futures-util = "0.3"
 log = "0.4"
 parking_lot = { version = "0.12", features = ["deadlock_detection"] }
diff --git a/playback/src/mixer/softmixer.rs b/playback/src/mixer/softmixer.rs
index 14adac4d2..6d32edc4b 100644
--- a/playback/src/mixer/softmixer.rs
+++ b/playback/src/mixer/softmixer.rs
@@ -1,4 +1,4 @@
-use atomic_shim::AtomicU64;
+use portable_atomic::AtomicU64;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;