acousticbrainz-client-git: use essentia-acousticbrainz

We don't use binaries anymore now.

2 files changed, 8 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccfc9932184f..c1298dfb223d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,11 +7,10 @@ pkgbase = acousticbrainz-client-git
 	arch = i686
 	license = GPL3
 	makedepends = git
+	depends = essentia-acousticbrainz
 	depends = python2-requests
 	source = git+https://github.com/MTG/acousticbrainz-client.git
-	source = http://acousticbrainz.org/static/download/essentia-extractor-21ef5f41f15ed1f80c8f9b36802430055d3b93e9-linux-.tar.gz
 	md5sums = SKIP
-	md5sums = 4fd57bc2fd9ed3755d62b016c72e68bc
 
 pkgname = acousticbrainz-client-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 78d37fea394e..f99527bcc285 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="client to upload data to an acousticbrainz server"
 arch=('x86_64' 'i686')
 url="http://acousticbrainz.org/"
 license=('GPL3')
-depends=('python2-requests')
+depends=('essentia-acousticbrainz' 'python2-requests')
 makedepends=('git')
 provides=()
 conflicts=()
@@ -17,24 +17,18 @@ options=()
 source=("git+https://github.com/MTG/$_pkgname.git")
 md5sums=('SKIP')
 
-# use binary essentia for now
-_EXT_HASH=21ef5f41f15ed1f80c8f9b36802430055d3b93e9
-_EXT="http://acousticbrainz.org/static/download/essentia-extractor-$_EXT_HASH-linux-$CARCH"
-source+=("$_EXT.tar.gz")
-if [ "$CARCH" = "x86_64" ]; then
-  md5sums+=('4aabb509dfc86530cdbecbdfdff6ab7d')
-else
-  md5sums+=('4fd57bc2fd9ed3755d62b016c72e68bc')
-fi
-
 pkgver() {
   cd "$srcdir/$_pkgname"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "$srcdir/$_pkgname"
+  # we have that in essentia-acousticbrainz
+  sed -i -e "s/, 'streaming_extractor_music'//" setup.py
+}
+
 build() {
-  cd "$srcdir/$_EXT"
-  cp streaming_extractor_music ../$_pkgname
   cd "$srcdir/$_pkgname"
   $_python setup.py build
 }