update

4 files changed, 66 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 828afdc93d27..881deb57a5c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,48 @@
-# Generated by makepkg 4.2.1
-# Mon Jun  8 15:31:13 UTC 2015
 pkgbase = jack-git
 	pkgdesc = A low-latency audio server
-	pkgver = 0.124.1.35.g6685cc7
+	pkgver = 0.125.0rc1.64.gb040837
 	pkgrel = 1
-	url = http://jackaudio.org
-	arch = i686
+	url = http://jackaudio.org/
 	arch = x86_64
 	license = GPL
 	license = LGPL
-	makedepends = git
+	makedepends = alsa-lib
+	makedepends = celt
 	makedepends = doxygen
+	makedepends = git
 	makedepends = libffado
-	makedepends = celt
+	makedepends = libsamplerate
+	makedepends = libsndfile
+	makedepends = readline
+	makedepends = zita-alsa-pcmi
+	makedepends = zita-resampler
 	depends = db
-	depends = libsamplerate
-	depends = zita-alsa-pcmi
-	depends = zita-resampler
-	optdepends = libffado: FireWire support
+	depends = gcc-libs
+	depends = glibc
 	optdepends = celt: NetJACK driver
-	provides = jack=0.124.1.35.g6685cc7
+	optdepends = libffado: FireWire support
+	optdepends = realtime-privileges: Acquire realtime privileges
+	provides = libjack.so
+	provides = libjackserver.so
+	provides = jack
 	conflicts = jack
 	conflicts = jack2
-	conflicts = jack-dbus
-	conflicts = jack2-dbus
-	source = jack-git::git://github.com/jackaudio/jack1.git
-	source = tools-git::git://github.com/jackaudio/tools.git
-	source = example-clients-git::git://github.com/jackaudio/example-clients.git
-	source = 99-audio.conf
-	source = 40-hpet-permissions.rules
+	source = jack-git::git+https://github.com/jackaudio/jack1.git
+	source = git+https://github.com/jackaudio/example-clients
+	source = git+https://github.com/jackaudio/headers
+	source = git+https://github.com/jackaudio/tools
+	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = ae65b7c9ebe0fff6c918ba9d97ae342d
-	md5sums = 471aad533ff56c5d3cbbf65ce32cadef
 
 pkgname = jack-git
-
+	depends = db
+	depends = gcc-libs
+	depends = glibc
+	depends = libasound.so
+	depends = libreadline.so
+	depends = libsndfile.so
+	depends = libsamplerate.so
+	depends = libzita-alsa-pcmi.so
+	depends = libzita-resampler.so
diff --git a/40-hpet-permissions.rules b/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9d9b..000000000000
--- a/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/99-audio.conf b/99-audio.conf
deleted file mode 100644
index eb76ef92030b..000000000000
--- a/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio 	- rtprio 	99
-@audio 	- memlock 	unlimited
diff --git a/PKGBUILD b/PKGBUILD
index 21bc4d31a821..3c4379cb354a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,33 @@
-# Maintainer: Joakim Hernberg <jhernberg@alchemy.lu>
+# Contributor: Michal Wojdyla < micwoj9292 at gmail dot com >
+# Contributor: Joakim Hernberg <jhernberg@alchemy.lu>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=jack-git
-pkgver=0.124.1.35.g6685cc7
+pkgver=0.125.0rc1.64.gb040837
 pkgrel=1
-
 pkgdesc="A low-latency audio server"
-url="http://jackaudio.org"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL' 'LGPL')
-
-depends=('db' 'libsamplerate' 'zita-alsa-pcmi' 'zita-resampler')
-makedepends=('git' 'doxygen' 'libffado' 'celt')
-optdepends=('libffado: FireWire support' 'celt: NetJACK driver')
-
-provides=("jack=$pkgver")
-conflicts=('jack' 'jack2' 'jack-dbus' 'jack2-dbus')
-
-source=("$pkgname::git://github.com/jackaudio/jack1.git"
-        'tools-git::git://github.com/jackaudio/tools.git'
-        'example-clients-git::git://github.com/jackaudio/example-clients.git'
-	    '99-audio.conf'
-        '40-hpet-permissions.rules')
-
-md5sums=('SKIP' 'SKIP' 'SKIP'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef')
+url="http://jackaudio.org/"
+depends=('db' 'gcc-libs' 'glibc')
+makedepends=('alsa-lib' 'celt' 'doxygen' 'git' 'libffado' 'libsamplerate'
+'libsndfile' 'readline' 'zita-alsa-pcmi' 'zita-resampler')
+optdepends=('celt: NetJACK driver'
+            'libffado: FireWire support'
+            'realtime-privileges: Acquire realtime privileges')
+provides=('libjack.so' 'libjackserver.so' 'jack')
+conflicts=('jack' 'jack2')
+
+source=("$pkgname::git+https://github.com/jackaudio/jack1.git"
+        "git+https://github.com/jackaudio/example-clients"
+        "git+https://github.com/jackaudio/headers"
+        "git+https://github.com/jackaudio/tools")
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP')
 
 pkgver() {
   cd "$pkgname"
@@ -38,24 +38,25 @@ prepare()
 {
   cd "$pkgname"
   git submodule init
-  git config submodule.tools/master.url "$srcdir"/tools
-  git config submodule.example-clients/master.url "$srcdir"/example-clients
-  git submodule update jack tools example-clients
+  git config submodule.example-clients.url "${srcdir}/example-clients"
+  git config submodule.jack.url "${srcdir}/headers"
+  git config submodule.tools.url "${srcdir}/tools"
+  git submodule update
+  autoreconf -vfi
 }
 
 build() {
   cd "$pkgname"
-  ./autogen.sh
-  ./configure --prefix=/usr --libdir=/usr/lib
+  ./configure --prefix=/usr \
+              --libdir=/usr/lib
   make
 }
 
 package() {
-  cd "$pkgname"
-  make DESTDIR="$pkgdir" install
-
-  # configure realtime access/scheduling
-  # see https://bugs.archlinux.org/task/26343
-  install -Dm644 "$srcdir"/99-audio.conf "$pkgdir"/etc/security/limits.d/99-audio.conf
-  install -Dm644 "$srcdir"/40-hpet-permissions.rules "$pkgdir"/usr/lib/udev/rules.d/40-hpet-permissions.rules
+  depends+=('libasound.so' 'libreadline.so' 'libsndfile.so' 'libsamplerate.so'
+  'libzita-alsa-pcmi.so' 'libzita-resampler.so')
+   cd "$pkgname"
+   make DESTDIR="$pkgdir" install
+  install -vDm 644 {AUTHORS,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
+# vim:set ts=2 sw=2 et: