dependency fix

2 files changed, 20 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ad1158f2b01..cf93b8456f95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Dec 15 22:20:05 UTC 2020
+# Wed Dec 16 07:17:52 UTC 2020
 pkgbase = mixxx-git
 	pkgdesc = Digital DJ mixing software. Git master branch (development/alpha).
-	pkgver = r7686
+	pkgver = r7688
 	pkgrel = 1
 	url = http://www.mixxx.org/
 	arch = i686
@@ -41,6 +41,7 @@ pkgbase = mixxx-git
 	depends = speex
 	depends = taglib
 	depends = upower
+	depends = libebur128
 	provides = mixxx
 	conflicts = mixxx
 	source = mixxx::git+https://github.com/mixxxdj/mixxx.git
diff --git a/PKGBUILD b/PKGBUILD
index 3f5d54c0d17c..18143446eaec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Holzhaus <jholthuis@mixxx.org>
 
 pkgname=mixxx-git
-pkgver=r7686
+pkgver=r7688
 pkgrel=1
 pkgdesc="Digital DJ mixing software. Git master branch (development/alpha)."
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL2')
 groups=('pro-audio')
 depends=('chromaprint' 'flac' 'fftw' 'hidapi' 'lame' 'libsndfile' 'libmodplug' 'libid3tag' 'liblilv-0.so' 'libmad' 'libmp4v2' 'libportaudio.so' 
 'libportmidi.so' 'librubberband.so' 'libtheora' 'opusfile' 'protobuf' 'qt5-script'
-'qt5-svg' 'qt5-x11extras' 'qtkeychain' 'soundtouch' 'speex' 'taglib' 'upower')
+'qt5-svg' 'qt5-x11extras' 'qtkeychain' 'soundtouch' 'speex' 'taglib' 'upower' 'libebur128')
 makedepends=('git' 'glu' 'lv2' 'qt5-tools' 'cmake' 'vamp-plugin-sdk' 'qt5-declarative')
 provides=('mixxx')
 conflicts=('mixxx')
@@ -24,26 +24,20 @@ pkgver() {
    echo "r$(git log --pretty=oneline --first-parent | wc -l)"
 }
 
+prepare() {
+	mkdir "$srcdir/${pkgname%-*}/cmake_build"
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -S $srcdir/${pkgname%-*} -B $srcdir/${pkgname%-*}/cmake_build
+}
+
 build() {
-   mkdir -p "$srcdir/build"
-   cd "$srcdir/build" || exit 1
-   cmake \
-    -DCMAKE_INSTALL_PREFIX=/ \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DOPTIMIZE=native \
-    -DFAAD=ON \
-    -DLILV=ON \
-    -DFFMPEG=ON \
-    -DKEYFINDER=OFF \
-    -DMAD=ON \
-    -DMODPLUG=ON \
-    -DOPUS=ON \
-    -DQTKEYCHAIN=ON \
-    "$srcdir/${pkgname%-*}"
-  cmake --build . --parallel "$(nproc)"
- }
+  cmake --build $srcdir/${pkgname%-*}/cmake_build --parallel `nproc`
+}
 
- package() {
-  cd "$srcdir/build" || exit 1
-  make DESTDIR="$pkgdir" install
- }
+#check() {
+#	cd "$srcdir/${pkgname%-*}"
+#	xvfb-run lin64_build/${pkgname%-*}-test
+#}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install $srcdir/${pkgname%-*}/cmake_build
+}