PKGBUILD: Adding Moving libffado to optdepends. Moving libsamplerate to depends (libffado doesn't pull it in anymore).

2 files changed, 13 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index decfe99e6a9b..2df3dea1849b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = jack2-git
 	pkgdesc = The next-generation JACK with SMP support
-	pkgver = 1.9.12.r91.g205e0d7b
+	pkgver = 1.9.12.r119.g82329969
 	pkgrel = 1
 	epoch = 1
 	url = http://jackaudio.org/
 	arch = x86_64
 	groups = pro-audio
-	license = GPL
+	license = GPL2
+	license = GPL3
 	makedepends = python
 	makedepends = celt
 	makedepends = opus
@@ -14,6 +15,8 @@ pkgbase = jack2-git
 	makedepends = git
 	makedepends = libffado
 	optdepends = a2jmidid: Expose legacy ALSA sequencer applications in JACK MIDI
+	optdepends = libffado: Firewire support
+	optdepends = portaudio: Portaudio support
 	optdepends = realtime-privileges: Acquire realtime privileges
 	source = jack2-git::git+https://github.com/jackaudio/jack2
 	md5sums = SKIP
@@ -21,8 +24,8 @@ pkgbase = jack2-git
 pkgname = jack2-git
 	pkgdesc = JACK low-latency audio server for multi-processor machines (daemon activation)
 	depends = celt
-	depends = libffado
 	depends = opus
+	depends = libsamplerate
 	depends = python-dbus
 	provides = jack
 	conflicts = jack
@@ -31,8 +34,8 @@ pkgname = jack2-git
 pkgname = jack2-dbus-git
 	pkgdesc = JACK low-latency audio server for multi-processor machines (only dbus activation)
 	depends = celt
-	depends = libffado
 	depends = opus
+	depends = libsamplerate
 	depends = python-dbus
 	provides = jack
 	provides = jack2
diff --git a/PKGBUILD b/PKGBUILD
index d52653bbdad6..e3dfbe2ca202 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,17 @@ _name=jack2
 pkgbase=jack2-git
 pkgname=('jack2-git' 'jack2-dbus-git')
 pkgdesc="The next-generation JACK with SMP support"
-pkgver=1.9.12.r91.g205e0d7b
+pkgver=1.9.12.r119.g82329969
 pkgrel=1
 epoch=1
 arch=('x86_64')
 url="http://jackaudio.org/"
-license=('GPL')
+license=('GPL2' 'GPL3')
 groups=('pro-audio')
 makedepends=('python' 'celt' 'opus' 'libsamplerate' 'git' 'libffado')
 optdepends=('a2jmidid: Expose legacy ALSA sequencer applications in JACK MIDI'
+            'libffado: Firewire support'
+            'portaudio: Portaudio support'
             'realtime-privileges: Acquire realtime privileges')
 source=("${pkgname}::git+https://github.com/jackaudio/jack2")
 md5sums=('SKIP')
@@ -54,7 +56,7 @@ build() {
 
 package_jack2-git() {
   pkgdesc="JACK low-latency audio server for multi-processor machines (daemon activation)"
-  depends=('celt' 'libffado' 'opus' 'python-dbus')
+  depends=('celt' 'opus' 'libsamplerate' 'python-dbus')
   conflicts=('jack' 'jack2-dbus')
   provides=('jack')
 
@@ -64,7 +66,7 @@ package_jack2-git() {
 
 package_jack2-dbus-git() {
   pkgdesc="JACK low-latency audio server for multi-processor machines (only dbus activation)"
-  depends=('celt' 'libffado' 'opus' 'python-dbus')
+  depends=('celt' 'opus' 'libsamplerate' 'python-dbus')
   conflicts=('jack' 'jack2')
   provides=('jack' 'jack2')