From 19f11e0c4bbeefd65f85546a361e18532b60416a Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 19 Dec 2012 02:52:08 -0800
Subject: Wed Dec 19 02:48:18 PST 2012

---
 community/jack2/PKGBUILD | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

(limited to 'community/jack2')

diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index fee756cdb..6a7b489f7 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77160 2012-10-06 07:11:43Z schiv $
+# $Id: PKGBUILD 81344 2012-12-18 10:05:59Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -8,22 +8,20 @@ pkgbase=jack2
 pkgname=('jack2' 'jack2-dbus')
 #pkgname= # single build (overrides split)
 _tarname=jack
-pkgver=1.9.8
-pkgrel=4
+pkgver=1.9.9.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
-makedepends=('python2' 'doxygen' 'libffado'
-             'libsamplerate' 'dbus-core' 'celt')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
+makedepends=('python2' 'libffado' 'celt'
+             'libsamplerate' 'dbus-core')
+source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2"
         '99-audio.conf'
-        '40-hpet-permissions.rules'
-        'ffado_setbuffsize-jack2.patch')
-md5sums=('1dd2ff054cab79dfc11d134756f27165'
+        '40-hpet-permissions.rules')
+md5sums=('6c9de6b89db9d7076fa2ce222816cf4c'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef'
-         '1502d82fe2276d6f224fff6467a0b6f9')
+         '471aad533ff56c5d3cbbf65ce32cadef')
 
 _pyfix() {
   sed -i 's:bin/env python:bin/env python2:' \
@@ -33,8 +31,10 @@ _pyfix() {
 _wafconf() {
   python2 waf configure --prefix=/usr \
                         --alsa \
-                        --firewire \
-                        --doxygen $@
+                        --firewire $@
+
+  # not building with doxygen
+  # see https://github.com/jackaudio/jack2/issues/22
 }
 
 _isbuild() {
@@ -42,15 +42,7 @@ _isbuild() {
 }
 
 build() {
-  cd "$srcdir/$_tarname-$pkgver"
-
-  # backport firewire stuff
-  #   - needed for setbuffsize feature in latest stable ffado
-  # from https://github.com/jackaudio/jack2/commit/96e0251
-  (
-  cd $_tarname-$pkgver
-  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch"
-  )
+  cd "$srcdir"
 
   # Some optimisation bug exists for current GCC
   # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663
@@ -58,7 +50,8 @@ build() {
   export CXXFLAGS="$CFLAGS"
 
   # fix doxygen building
-  sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
+  # TODO: report upstream, but redundant until gihub issue 22 resolves
+  #sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
 
   # we may do 2 different builds
   cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
@@ -93,7 +86,7 @@ package_jack2() {
   conflicts=('jack')
   provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
 
-  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
@@ -119,7 +112,7 @@ package_jack2-dbus() {
   conflicts=('jack' 'jack2')
   provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
 
-  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
+  cd "$srcdir/$_tarname-dbus-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
-- 
cgit v1.2.3-54-g00ecf