From 7d41d6a23fabac3273eb185a3eacd925dd1528d8 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 11 Dec 2025 07:29:49 +0000
Subject: [PATCH] Adding Mopidy-Tidal, explicit GST branch

---
 Dockerfile                 | 9 ++++++---
 Dockerfile.alpine          | 1 +
 docker-compose.example.yml | 2 ++
 docker/requirements.txt    | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 09313249..75969189 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,8 +32,10 @@ RUN apt update \
 WORKDIR /usr/src/gst-plugins-rs
 
 # Clone source of gst-plugins-rs to workdir
+
+ARG GST_PLUGINS_BRANCH=spotify-logging
 RUN git clone -c advice.detachedHead=false \
-	--single-branch --depth 1 \
+	--single-branch -b ${GST_PLUGINS_BRANCH} --depth 1 \
 	https://gitlab.freedesktop.org/kingosticks/gst-plugins-rs ./
 
 # Build GStreamer plugins written in Rust (optional with --no-default-features)
@@ -78,6 +80,7 @@ RUN apt-get update \
     python3-setuptools \
     python3-pip \
     python3-venv \
+    python3-cairo \
     # GStreamer (Plugins)
     gstreamer1.0-plugins-good \
     gstreamer1.0-plugins-bad \
@@ -101,7 +104,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
 # see https://docs.mopidy.com/en/latest/installation/debian/
 RUN mkdir -p /etc/apt/keyrings \
  && wget -q -O /etc/apt/keyrings/mopidy-archive-keyring.gpg https://apt.mopidy.com/mopidy.gpg \
- && wget -q -O /etc/apt/sources.list.d/mopidy.list https://apt.mopidy.com/bullseye.list \
+ && wget -q -O /etc/apt/sources.list.d/mopidy.sources https://apt.mopidy.com/bookworm.sources \
  && apt-get update \
  && apt-get install -y mopidy \
  && rm -rf /var/lib/apt/lists/*
@@ -130,7 +133,7 @@ RUN git clone --depth 1 --single-branch -b ${IRIS_VERSION} https://github.com/ja
 ARG MOPIDY_SPOTIFY_TAG=v5.0.0a3
 RUN git clone --depth 1 --single-branch -b ${MOPIDY_SPOTIFY_TAG} https://github.com/mopidy/mopidy-spotify.git mopidy-spotify \
  && cd mopidy-spotify \
- && python3 setup.py install \
+ && python3 -m pip install . \
  && cd .. \
  && rm -rf mopidy-spotify
 
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index d4301719..d66172d5 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -17,6 +17,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/reposit
   alsa-utils \
   py3-pip \
   mopidy \
+  libcairo2 \
   py3-mopidy-spotify
 
 # Install Node, to build Iris JS application
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index c85aa7a4..39bb22f5 100755
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -9,6 +9,8 @@ services:
       - 1704
       - 1705
       - 1780
+    extra_hosts:
+      - "apresolve.spotify.com=0.0.0.0"
     volumes:
       - /tmp/snapserver:/tmp
       - ./docker/snapserver/snapserver.conf:/etc/snapserver.conf
diff --git a/docker/requirements.txt b/docker/requirements.txt
index 3be2d1a1..494b9894 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -2,6 +2,7 @@ Mopidy-Local
 Mopidy-Mpd
 Mopidy-MusicBox-Webclient
 Mopidy-Soundcloud
+Mopidy-Tidal
 Mopidy-Youtube
 Mopidy-YTMusic
 ytmusicapi