move to python3 in develop

2 files changed, 31 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1ff8739528d..928f1be9e5f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,48 +1,42 @@
 pkgbase = tizonia-all-git
 	pkgdesc = Command-line cloud music player for Linux with support for Spotify, Google Play Music, YouTube, SoundCloud, Dirble Internet Radio, Plex servers and Chromecast devices.
-	pkgver = 0.18.0.r0.g89a4d6a6
+	pkgver = 0.18.0.r55.g28b2b257
 	pkgrel = 1
 	url = https://www.tizonia.org
 	arch = x86_64
 	license = LGPL
+	makedepends = git
+	makedepends = boost
+	makedepends = check
 	depends = libmad
-	depends = sqlite
-	depends = libutil-linux
 	depends = taglib
 	depends = mediainfo
 	depends = sdl
 	depends = lame
 	depends = faad2
 	depends = libcurl-gnutls
-	depends = libvorbis
 	depends = libvpx
 	depends = mpg123
-	depends = opus
 	depends = opusfile
-	depends = libogg
 	depends = libfishsound
-	depends = flac
 	depends = liboggz
-	depends = libsndfile
-	depends = alsa-lib
 	depends = libpulse
-	depends = boost
-	depends = check
-	depends = python2-pafy
-	depends = python2-eventlet
+	depends = boost-libs
+	depends = hicolor-icon-theme
+	depends = python-eventlet
 	depends = log4c
 	depends = libspotify
-	depends = python2-gmusicapi
-	depends = python2-soundcloud-git
-	depends = python2-youtube-dl-git
-	depends = python2-pychromecast-git
+	depends = python-pafy
+	depends = python-gmusicapi
+	depends = python-soundcloud-git
+	depends = youtube-dl
+	depends = python-pychromecast-git
 	depends = python-plexapi
-	depends = python2-fuzzywuzzy
-	depends = python2-eventlet
-	depends = python2-spotipy
+	depends = python-fuzzywuzzy
+	depends = python-spotipy
 	provides = tizonia-all
 	conflicts = tizonia-all
-	source = tizonia-all-git::git+https://github.com/tizonia/tizonia-openmax-il.git
+	source = tizonia-all-git::git+https://github.com/tizonia/tizonia-openmax-il.git#branch=develop
 	sha256sums = SKIP
 
 pkgname = tizonia-all-git
diff --git a/PKGBUILD b/PKGBUILD
index 595c1d45cd94..b290380b142e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,55 +2,47 @@
 
 _githubname=tizonia-openmax-il
 pkgname=tizonia-all-git
-pkgver=0.18.0.r0.g89a4d6a6
+pkgver=0.18.0.r55.g28b2b257
 pkgrel=1
 pkgdesc="Command-line cloud music player for Linux with support for Spotify, Google Play Music, YouTube, SoundCloud, Dirble Internet Radio, Plex servers and Chromecast devices."
 arch=('x86_64')
 url="https://www.tizonia.org"
 license=('LGPL')
+makedepends=('git' 'boost' 'check')
 depends=(
     # official repositories:
     'libmad'
-    'sqlite'
-    'libutil-linux'
     'taglib'
     'mediainfo'
     'sdl'
     'lame'
     'faad2'
     'libcurl-gnutls'
-    'libvorbis'
     'libvpx'
     'mpg123'
-    'opus'
     'opusfile'
-    'libogg'
     'libfishsound'
-    'flac'
     'liboggz'
-    'libsndfile'
-    'alsa-lib'
     'libpulse'
-    'boost'
-    'check'
-    'python2-pafy'
-    'python2-eventlet'
+    'boost-libs'
+    'hicolor-icon-theme'
+    'python-eventlet'
 
     # AUR:
     'log4c'
     'libspotify'
-    'python2-gmusicapi'
-    'python2-soundcloud-git'
-    'python2-youtube-dl-git'
-    'python2-pychromecast-git'
+    'python-pafy'
+    'python-gmusicapi'
+    'python-soundcloud-git'
+    'youtube-dl'
+    'python-pychromecast-git'
     'python-plexapi'
-    'python2-fuzzywuzzy'
-    'python2-eventlet'
-    'python2-spotipy'
+    'python-fuzzywuzzy'
+    'python-spotipy'
 )
 provides=('tizonia-all')
 conflicts=('tizonia-all')
-source=("${pkgname}"::"git+https://github.com/tizonia/${_githubname}.git")
+source=("${pkgname}"::git+https://github.com/tizonia/${_githubname}.git#branch=develop)
 sha256sums=('SKIP')
 
 pkgver() {
@@ -69,13 +61,13 @@ prepare() {
       exit 1; }
   mkdir -p "$srcdir/path"
   # Tizonia expects Python 2
-  ln -sf /usr/bin/python2 "$srcdir/path/python"
-  ln -sf /usr/bin/python2-config "$srcdir/path/python-config"
+  ln -sf /usr/bin/python "$srcdir/path/python"
+  ln -sf /usr/bin/python-config "$srcdir/path/python-config"
 }
 
 build() {
     export PATH="$srcdir/path:$PATH"
-    export PYTHON="/usr/bin/python2"
+    export PYTHON="/usr/bin/python"
     cd "$pkgname"
     autoreconf -ifs
     ./configure \