Add a version with D-Bus support.

This support is still labeled as "experimental" by upstream, so I'm
reluctant to actually add it to the base install.

This rebuild also removes the version patch. This was necessary in order
to use the upstream Cargo.lock. Using the locked versions seems
advisable after the recent NPM debacle.

1 files changed, 17 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b8f24eb8f881..d67a6ac6749e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,31 @@
 # Contributor: Florian Klink <flokli@flokli.de>
 
 pkgbase=spotifyd
-pkgname=('spotifyd' 'spotifyd-pulseaudio')
+pkgname=('spotifyd' 'spotifyd-pulseaudio' 'spotifyd-dbus-mpris')
 pkgver=0.2.3
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'armv7h' 'aarch64')
 license=('GPL3')
 depends=('alsa-lib' 'libogg' 'gcc-libs')
 makedepends=('cargo' 'libpulse')
 pkgdesc="A spotify playing daemon"
 url="https://github.com/Spotifyd/$pkgbase"
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/Spotifyd/$pkgbase/archive/v$pkgver.tar.gz"
-        "version.patch")
-sha256sums=('619f5270023e70b3fb8329b9b8995800833768850014e320c734c067fce4b1b5'
-            'e00756b06c03f5bbb03fc5541321101f6fd67cdea14c456718744b7f5f109fbf')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/Spotifyd/$pkgbase/archive/v$pkgver.tar.gz")
+sha256sums=('619f5270023e70b3fb8329b9b8995800833768850014e320c734c067fce4b1b5')
 
 prepare() {
   cd "$srcdir/spotifyd-$pkgver"
-  # Fix the wrong version being reported
-  patch -p1 < "$srcdir/version.patch"
 }
 
 build() {
   cd "$srcdir/spotifyd-$pkgver"
-  cargo build --release
-  # Compile any remaining libraries for pulseaudio
-  cargo build --release --features pulseaudio_backend
+  cargo build --release --locked
+  # Compile any remaining libraries features
+  cargo build --release --locked --features pulseaudio_backend,dbus_mpris
 }
 
 package_spotifyd() {
-  cargo install --root "$pkgdir/usr" --path "$srcdir/$pkgbase-$pkgver"
+  cargo install --locked --root "$pkgdir/usr" --path "$srcdir/$pkgbase-$pkgver"
   rm "$pkgdir/usr/.crates.toml"
   install -D -m 644 "$srcdir/$pkgbase-$pkgver/contrib/spotifyd.service" "$pkgdir/usr/lib/systemd/user/spotifyd.service"
 }
@@ -40,7 +36,15 @@ package_spotifyd-pulseaudio() {
   depends=(libpulse)
   conflicts=(spotifyd)
   pkgdesc="$pkgdesc, with pulseaudio support"
-  cargo install --root "$pkgdir/usr" --path "$srcdir/$pkgbase-$pkgver" --features pulseaudio_backend
+  cargo install --locked --root "$pkgdir/usr" --path "$srcdir/$pkgbase-$pkgver" --features pulseaudio_backend
+  rm "$pkgdir/usr/.crates.toml"
+  install -D -m 644 "$srcdir/$pkgbase-$pkgver/contrib/spotifyd.service" "$pkgdir/usr/lib/systemd/user/spotifyd.service"
+}
+
+package_spotifyd-dbus-mpris() {
+  conflicts=(spotifyd)
+  pkgdesc="$pkgdesc, with D-Bus MPRIS"
+  cargo install --locked --root "$pkgdir/usr" --path "$srcdir/$pkgbase-$pkgver" --features dbus_mpris
   rm "$pkgdir/usr/.crates.toml"
   install -D -m 644 "$srcdir/$pkgbase-$pkgver/contrib/spotifyd.service" "$pkgdir/usr/lib/systemd/user/spotifyd.service"
 }