dependencies cleanup

2 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3629b79305dc..02dbb3f8d775 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Oct 15 07:31:41 UTC 2016
+# Fri Dec 15 21:21:43 UTC 2017
 pkgbase = mixxx-git
 	pkgdesc = Digital DJ mixing software. Development branch from git.
-	pkgver = release.2.0.0.r2462.g2d4f67e
+	pkgver = release.2.0.0.r6032.g24028f2e8
 	pkgrel = 1
 	url = http://www.mixxx.org/
 	arch = i686
@@ -12,20 +12,20 @@ pkgbase = mixxx-git
 	makedepends = scons
 	makedepends = pkgconfig
 	makedepends = glu
-	depends = libid3tag
 	depends = libmad
-	depends = portaudio
+	depends = libusb
+	depends = faad2
 	depends = qt4
-	depends = libshout
 	depends = taglib
+	depends = libmp4v2
+	depends = rubberband
+	depends = portaudio
 	depends = portmidi
 	depends = protobuf
-	depends = chromaprint
-	depends = rubberband
+	depends = libshout
+	depends = libid3tag
 	depends = opusfile
-	depends = hidapi
-	depends = faad2
-	depends = libmp4v2
+	depends = chromaprint
 	provides = mixxx
 	conflicts = mixxx
 	conflicts = mixxx1.11-git
diff --git a/PKGBUILD b/PKGBUILD
index 12c52f5a576f..1f315171e4d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,30 @@
 # Maintainer: Gimmeapill <gimmeapill at gmail dot com>
 
 pkgname=mixxx-git
-pkgver=release.2.0.0.r2462.g2d4f67e
+pkgver=release.2.0.0.r6032.g24028f2e8
 pkgrel=1
 pkgdesc="Digital DJ mixing software. Development branch from git."
 arch=('i686' 'x86_64')
 url="http://www.mixxx.org/"
 license=('GPL2')
-#depends=('libid3tag' 'libmad' 'portaudio' 'qt4' 'libshout' 'taglib' 'portmidi' 'protobuf' 'libusbx' 'chromaprint' 'rubberband' 'vamp-plugin-sdk' 'sqlite' 'opus' 'opusfile' 'hidapi')
-depends=('libid3tag' 'libmad' 'portaudio' 'qt4' 'libshout' 'taglib' 'portmidi' 'protobuf' 'chromaprint' 'rubberband' 'opusfile' 'hidapi' 'faad2' 'libmp4v2')
+depends=(libmad libusb faad2 qt4 taglib libmp4v2 rubberband portaudio portmidi protobuf libshout libid3tag opusfile chromaprint)
 makedepends=('git' 'scons' 'pkgconfig' 'glu')
-provides=(mixxx)
-conflicts=(mixxx mixxx1.11-git mixxx1.12-git mixxx_stable-git)
-source=('mixxx::git+https://github.com/mixxxdj/mixxx.git')
+provides=("${pkgname%-*}")
+conflicts=("${pkgname%-*}" mixxx1.11-git mixxx1.12-git mixxx_stable-git)
+source=("${pkgname%-*}::git+https://github.com/mixxxdj/mixxx.git")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/mixxx"
+  cd "$srcdir/${pkgname%-*}"
   echo "$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')"
 }
 
 build() {
-  cd "$srcdir/mixxx"
+  cd "$srcdir/${pkgname%-*}"
   scons qtdir=/usr/lib/qt4 prefix=/usr install_root="$pkgdir/usr" -j2 virtualize=0 localecompare=1 qt_sqlite_plugin=0 opus=1 optimize=native build=release battery=0 faad=1
 }
 
 package() {
-  cd "$srcdir/mixxx"
+  cd "$srcdir/${pkgname%-*}"
   scons qtdir=/usr/lib/qt4 prefix=/usr install_root="$pkgdir/usr" install
 }