Adapt to rewrite.

5 files changed, 20 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df4fd35660e7..a6c099135307 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 # Generated by mksrcinfo v8
-# Sat Mar  5 21:36:02 UTC 2016
+# Sun May  1 21:22:17 UTC 2016
 pkgbase = spotify-connect-web
 	pkgdesc = Simple Web client for accessing Spotify connect api (Raspberry Pi 2)
-	pkgver = r57.ef8430d
-	pkgrel = 3
+	pkgver = r55.979f510
+	pkgrel = 1
 	url = https://github.com/chukysoria/spotify-connect-web
 	install = spotify-connect-web.install
-	arch = armv7h
-	license = unknown
+	arch = any
+	license = Apache
 	makedepends = git
 	depends = python2-flask
 	depends = python2-flask-bootstrap
+	depends = python2-flask-cors
 	depends = python2-pyalsaaudio
 	depends = python2-gevent
 	depends = python2-cffi
@@ -19,15 +20,11 @@ pkgbase = spotify-connect-web
 	provides = spotify-connect-web
 	conflicts = spotify-connect-web
 	source = git+https://github.com/chukysoria/spotify-connect-web#branch=master
-	source = https://github.com/sashahilton00/spotify-connect-resources/raw/master/armhf%20version/libspotify_embedded_shared.so
 	source = spotify-connect-web@.service
 	source = spotify-connect-web.install
-	source = 0001-Fix-0.8.patch
 	sha256sums = SKIP
-	sha256sums = 05a1d441fee75bae6d6b8c94538389e232bea79133cda673e780ca3b97e6a95d
-	sha256sums = 2f418748822fb87caf84c603478be9e409651b6a62a5957882138b37b0b37987
-	sha256sums = 876ca4593670c1ca9b968e93413b90f51b4d10c325a7dbb313052037e6a9888c
-	sha256sums = 5cf33136d33b756e9ed55f92d579d4056df3338b58977d058e29b6c63865fba6
+	sha256sums = 42a8a539419e6841cb3b00570ca998f884eae899b4275a072ce5e8c57bf23527
+	sha256sums = b70e8014ef0bc217e8837d8979930d2f1d2ff3cfd18aff8e117f8e9736e9789e
 
 pkgname = spotify-connect-web
 
diff --git a/0001-Fix-0.8.patch b/0001-Fix-0.8.patch
deleted file mode 100644
index cf3fd4e4237e..000000000000
--- a/0001-Fix-0.8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1595b61cee8c5c9df1105f33e3709d6efae41c38 Mon Sep 17 00:00:00 2001
-From: oschwede <oschwede@pi.local>
-Date: Thu, 3 Mar 2016 17:12:27 +0100
-Subject: [PATCH 1/1] Fix 0.8
-
----
- console_callbacks.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/console_callbacks.py b/console_callbacks.py
-index cfe3448..a013c6d 100644
---- a/console_callbacks.py
-+++ b/console_callbacks.py
-@@ -48,7 +48,7 @@ class AlsaSink:
-                 pcm = alsa.PCM(
-                     type = alsa.PCM_PLAYBACK,
-                     mode = alsa.PCM_NORMAL,
--                    card = self._args.device)
-+                    card = str(self._args.device))
- 
-                 pcm.setchannels(CHANNELS)
-                 pcm.setrate(RATE)
--- 
-2.7.2
-
diff --git a/PKGBUILD b/PKGBUILD
index d95ba52f3b62..2afc10080482 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: crystaly <crystaly [ at ] posteo [ dot ] de>
 pkgname=spotify-connect-web
-pkgver=r57.ef8430d
-pkgrel=3
+pkgver=r55.979f510
+pkgrel=1
 pkgdesc="Simple Web client for accessing Spotify connect api (Raspberry Pi 2)"
-arch=('armv7h')
+arch=('any')
 url="https://github.com/chukysoria/spotify-connect-web"
-license=('unknown')
+license=('Apache')
 groups=()
-depends=('python2-flask' 'python2-flask-bootstrap' 'python2-pyalsaaudio' 'python2-gevent' 'python2-cffi' 'python2-pycparser' 'python2')
+depends=('python2-flask' 'python2-flask-bootstrap' 'python2-flask-cors' 'python2-pyalsaaudio' 'python2-gevent' 'python2-cffi' 'python2-pycparser' 'python2')
 makedepends=('git')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
@@ -16,16 +16,12 @@ backup=()
 options=()
 install="${pkgname}.install"
 source=('git+https://github.com/chukysoria/spotify-connect-web#branch=master'
-	'https://github.com/sashahilton00/spotify-connect-resources/raw/master/armhf%20version/libspotify_embedded_shared.so'
 	'spotify-connect-web@.service'
-	'spotify-connect-web.install'
-	'0001-Fix-0.8.patch')
+	'spotify-connect-web.install')
 noextract=()
 sha256sums=('SKIP'
-            '05a1d441fee75bae6d6b8c94538389e232bea79133cda673e780ca3b97e6a95d'
-            '2f418748822fb87caf84c603478be9e409651b6a62a5957882138b37b0b37987'
-            '876ca4593670c1ca9b968e93413b90f51b4d10c325a7dbb313052037e6a9888c'
-            '5cf33136d33b756e9ed55f92d579d4056df3338b58977d058e29b6c63865fba6')
+            '42a8a539419e6841cb3b00570ca998f884eae899b4275a072ce5e8c57bf23527'
+            'b70e8014ef0bc217e8837d8979930d2f1d2ff3cfd18aff8e117f8e9736e9789e')
 
 pkgver() {
 	cd "$srcdir/${pkgname%-git}"
@@ -37,12 +33,9 @@ pkgver() {
 prepare() {
 	cd "$srcdir/${pkgname%-git}"
 
-	# merge pull-request wich fixes alsaaudio
-	git merge ef8430d
+	# fix volmin/volmax parameters not being applied
+	sed -i 's|.mixer_load()|.mixer_load(self.args.mixer, self.args.volmin, self.args.volmax)|g' connect_console.py
 
-	# patch pyalsaaudio 0.8
-	patch -p1 -i "$srcdir/0001-Fix-0.8.patch"
-	
 	# replace python by python2
 	sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/env python2|g' *.py
 
@@ -56,12 +49,9 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-git}"
 
-	# copy libspotify.so to /usr/lib
-	install -D -m644 "$srcdir/libspotify_embedded_shared.so" "${pkgdir}/usr/lib/libspotify_embedded_shared.so"
-	
 	# copy app files
 	install -d -m755 "${pkgdir}/usr/lib/${pkgname}"
-	install -D -m 644 *.py *.pyc *.h "${pkgdir}/usr/lib/${pkgname}"
+	install -D -m 644 *.py *.pyc "${pkgdir}/usr/lib/${pkgname}"
 	
 	install -D -m644 "$srcdir/spotify-connect-web@.service" "${pkgdir}/usr/lib/systemd/system/spotify-connect-web@.service"
 
diff --git a/spotify-connect-web.install b/spotify-connect-web.install
index 094d0b4a720c..2ec1394e95dd 100644
--- a/spotify-connect-web.install
+++ b/spotify-connect-web.install
@@ -1,9 +1,5 @@
 
 post_upgrade() {
-	# compile cffi
-	cd /usr/lib/spotify-connect-web/
-        python2 -c "from connect_ffi import ffi, lib"
-
 	systemctl daemon-reload
 }
 
diff --git a/spotify-connect-web@.service b/spotify-connect-web@.service
index bc488de0b2a2..8ba75cbd3534 100644
--- a/spotify-connect-web@.service
+++ b/spotify-connect-web@.service
@@ -5,7 +5,7 @@ After=network.target
 
 [Service]
 User=%i
-ExecStart=/usr/bin/python2 /usr/lib/spotify-connect-web/main.py --key ${HOME}/.config/spotify-connect-web/spotify_appkey.key --credentials ${HOME}/.config/spotify-connect-web/credentials.json --bitrate 320 --name "SpotifyConnectWeb" --dbrange 50 -d
+ExecStart=/usr/bin/python2 /usr/lib/spotify-connect-web/main.py --key ${HOME}/.config/spotify-connect-web/spotify_appkey.key --credentials ${HOME}/.config/spotify-connect-web/credentials.json --bitrate 320 --name "SpotifyConnectWeb" --volmin=50 --volmax=80 -d
 #Restart=on-failure
 
 [Install]