From 19a10140592052698d68be11db5a59bc88fcf528 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 19 Aug 2022 08:36:10 +0100
Subject: gentoo auto-resync : 19:08:2022 - 08:36:10
---
media-sound/Manifest.gz | Bin 57051 -> 57054 bytes
media-sound/spotify/Manifest | 2 +-
media-sound/spotify/files/spotify-wrapper | 45 ++++++++++++++++++++----------
3 files changed, 31 insertions(+), 16 deletions(-)
(limited to 'media-sound')
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4dcb94df8d50..750ea7d32e4a 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 1888b4f6f245..cafa82985fdb 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,4 +1,4 @@
-AUX spotify-wrapper 647 BLAKE2B 6bb43ce4667ff954d301a99fbbd862a5c814c140a3ab56b16dd7adf520e9ebb51f6527ce07796bac058afc3a7c4cc97a85f9e996c6e3ffee8b2b29b731b4d718 SHA512 1202e39f6d3a47cac353ec9519695a424aaf51afe24d8ca6f3ec0ec79ec19020bbc7c6e43352121684b2b7789e2c7be32d4942ad4883d3076b19ad9eee4ab1c1
+AUX spotify-wrapper 1331 BLAKE2B df9c1114d92dfa876ff6c7e4aa60c1d1370ec0c3006174d2f054a55770e299d423eb43083af7785815c9900034336d9257fdb5f8f9be688dd6d1a5efc3dc4216 SHA512 a908ebecbc5272ffb4566bfbe398017f781672bff4b21a3efc71708cee4d3c4672443d99e71856e9134f484beae22fadf421b6aa29aa6aae143695aa835b4f04
DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
DIST spotify-client_1.1.84.716.gc5f8b819_amd64.deb 119770140 BLAKE2B 071ee877e9c6c9a64cc3e06cdd72530e5da60087c56c29ad9511ed427df987d76258142120442ad78370f2d78c282016025ed43f7f7e94b4efb44e4a201bc839 SHA512 3cc25f28ae791ac26607117a5df668f803ed8e58f0ace085010a6242fdde97766bdc1c752560850795c9b4324f3e019937fe9af2788a1946ebb70ee781f50d99
EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
diff --git a/media-sound/spotify/files/spotify-wrapper b/media-sound/spotify/files/spotify-wrapper
index db8f8b948780..fd6c4f314f9f 100644
--- a/media-sound/spotify/files/spotify-wrapper
+++ b/media-sound/spotify/files/spotify-wrapper
@@ -3,21 +3,36 @@
export LD_LIBRARY_PATH="/usr/$LIBDIR/apulse"
if command -v spotify-dbus.py > /dev/null; then
- echo "Launching spotify with Gnome systray integration."
- spotify-dbus.py "$@"
+ echo "Launching spotify with Gnome systray integration."
+ spotify-dbus.py "$@"
elif command -v spotify-tray > /dev/null; then
- echo "Launching spotify with generic systray integration."
- minimized=
- for arg; do
- if [ "$arg" = --minimized ]; then
- minimized=$arg
- break
- fi
- done
- spotify-tray \
- --client-path="$SPOTIFY_HOME/spotify" --toggle $minimized -- "$@"
+ echo "Launching spotify with generic systray integration."
+ minimized=
+ for arg; do
+ if [ "$arg" = --minimized ]; then
+ minimized=$arg
+ break
+ fi
+ done
+ spotify-tray \
+ --client-path="$SPOTIFY_HOME/spotify" --toggle $minimized -- "$@"
else
- echo "Neither gnome-integration-spotify nor spotify-tray are installed."
- echo "Launching spotify without systray integration."
- exec "$SPOTIFY_HOME/spotify" "$@"
+ if pgrep -f "Spotify/[0-9].[0-9].[0-9]" > /dev/null; then
+ busline="org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.OpenUri ${1}"
+ echo "Spotify is already running"
+ echo "Sending ${busline} to dbus"
+ if command -v qdbus &> /dev/null; then
+ qdbus $busline
+ exit
+ fi
+ if command -v dbus-send &> /dev/null; then
+ dbus-send $busline
+ exit
+ fi
+ echo "No bus dispatcher found."
+ else
+ echo "Neither gnome-integration-spotify nor spotify-tray are installed."
+ echo "Launching spotify without systray integration."
+ exec "$SPOTIFY_HOME/spotify" "$@"
+ fi
fi
--
cgit v1.2.3