Date: Thursday, February 4, 2016 @ 22:03:54 Author: schiv Revision: 160348
archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: jack2/repos/community-testing-i686/ jack2/repos/community-testing-i686/40-hpet-permissions.rules (from rev 160347, jack2/trunk/40-hpet-permissions.rules) jack2/repos/community-testing-i686/99-audio.conf (from rev 160347, jack2/trunk/99-audio.conf) jack2/repos/community-testing-i686/PKGBUILD (from rev 160347, jack2/trunk/PKGBUILD) jack2/repos/community-testing-i686/jack1compat.diff (from rev 160347, jack2/trunk/jack1compat.diff) jack2/repos/community-testing-x86_64/ jack2/repos/community-testing-x86_64/40-hpet-permissions.rules (from rev 160347, jack2/trunk/40-hpet-permissions.rules) jack2/repos/community-testing-x86_64/99-audio.conf (from rev 160347, jack2/trunk/99-audio.conf) jack2/repos/community-testing-x86_64/PKGBUILD (from rev 160347, jack2/trunk/PKGBUILD) jack2/repos/community-testing-x86_64/jack1compat.diff (from rev 160347, jack2/trunk/jack1compat.diff) ----------------------------------------------------+ community-testing-i686/40-hpet-permissions.rules | 2 community-testing-i686/99-audio.conf | 2 community-testing-i686/PKGBUILD | 134 +++++++++++++++++++ community-testing-i686/jack1compat.diff | 33 ++++ community-testing-x86_64/40-hpet-permissions.rules | 2 community-testing-x86_64/99-audio.conf | 2 community-testing-x86_64/PKGBUILD | 134 +++++++++++++++++++ community-testing-x86_64/jack1compat.diff | 33 ++++ 8 files changed, 342 insertions(+) Copied: jack2/repos/community-testing-i686/40-hpet-permissions.rules (from rev 160347, jack2/trunk/40-hpet-permissions.rules) =================================================================== --- community-testing-i686/40-hpet-permissions.rules (rev 0) +++ community-testing-i686/40-hpet-permissions.rules 2016-02-04 21:03:54 UTC (rev 160348) @@ -0,0 +1,2 @@ +KERNEL=="rtc0", GROUP="audio" +KERNEL=="hpet", GROUP="audio" Copied: jack2/repos/community-testing-i686/99-audio.conf (from rev 160347, jack2/trunk/99-audio.conf) =================================================================== --- community-testing-i686/99-audio.conf (rev 0) +++ community-testing-i686/99-audio.conf 2016-02-04 21:03:54 UTC (rev 160348) @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited Copied: jack2/repos/community-testing-i686/PKGBUILD (from rev 160347, jack2/trunk/PKGBUILD) =================================================================== --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2016-02-04 21:03:54 UTC (rev 160348) @@ -0,0 +1,134 @@ +# $Id$ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: Daniele Paolella <danielepaole...@email.it> +# Contributor: Philipp Überbacher <hollunder at gmx dot at> +# Contributor: Thomas Bahn <thomas-bahn at gmx dot net> + +pkgbase=jack2 +pkgname=('jack2' 'jack2-dbus') +#pkgname= # single build (overrides split) +_tarname=jack +pkgver=1.9.10 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://jackaudio.org/" +backup=(etc/security/limits.d/99-audio.conf) +license=('GPL') +makedepends=('python2-dbus' 'libffado' 'celt' 'opus' 'libsamplerate') +source=("https://dl.dropbox.com/u/28869550/jack-$pkgver.tar.bz2" + '99-audio.conf' + '40-hpet-permissions.rules' + 'jack1compat.diff') +md5sums=('4aeb91d7ae0cabce98355436ed4f217a' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' + '471aad533ff56c5d3cbbf65ce32cadef' + '8c367d60a6375ebacf0d53ad651a0486') + +_isbuild() { + printf "%s\n" ${pkgname[@]} | grep -qx $1 +} + +_pyfix() { + sed -i 's:bin/env python:bin/env python2:' \ + "$pkgdir/usr/bin/jack_control" +} + +_wafconf() { + python2 waf configure --prefix=/usr \ + --alsa \ + --firewire $@ + + # not building with doxygen + # see https://github.com/jackaudio/jack2/issues/22 +} + +prepare() { + cd "$srcdir" + + # Some optimisation bug exists for current GCC + # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 + #export CFLAGS="${CFLAGS/-O[0-9]/-O0}" + #export CXXFLAGS="$CFLAGS" + + # fix doxygen building + # TODO: report upstream, but redundant until github issue 22 resolves + #sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript + + + # see https://bugs.archlinux.org/task/47839 + (cd $_tarname-$pkgver && patch -Np1 -i $srcdir/jack1compat.diff) + + # we may do 2 different builds + cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver +} + +build() { + cd "$srcdir" + + # mixed dbus/classic build + if _isbuild jack2; then + cd $_tarname-$pkgver + msg2 "Running Mixed D-Bus/Classic build" + _wafconf --classic --dbus + python2 waf build $MAKEFLAGS + cd .. + fi + + # dbus-ONLY build + if _isbuild jack2-dbus; then + cd $_tarname-dbus-$pkgver + msg2 "Running D-Bus-only build" + _wafconf --dbus + python2 waf build $MAKEFLAGS + cd .. + fi +} + +package_jack2() { + ! _isbuild jack2 && return 0 + + pkgdesc="The next-generation JACK with SMP support" + depends=('libsamplerate' 'celt' 'opus' 'libffado') + optdepends=('python2-dbus: jack_control') + conflicts=('jack') + provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') + + cd "$srcdir/$_tarname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + # fix for major python transition + _pyfix + + # 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" +} + +package_jack2-dbus() { + ! _isbuild jack2-dbus && return 0 + + pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" + depends=('libsamplerate' 'celt' 'opus' 'libffado') + optdepends=('python2-dbus: jack_control') + conflicts=('jack' 'jack2') + provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') + + cd "$srcdir/$_tarname-dbus-$pkgver" + + python2 waf install --destdir="$pkgdir" + + _pyfix + + 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" +} + +# vim:set ts=2 sw=2 et: Copied: jack2/repos/community-testing-i686/jack1compat.diff (from rev 160347, jack2/trunk/jack1compat.diff) =================================================================== --- community-testing-i686/jack1compat.diff (rev 0) +++ community-testing-i686/jack1compat.diff 2016-02-04 21:03:54 UTC (rev 160348) @@ -0,0 +1,33 @@ +diff --git a/common/jack/types.h b/common/jack/types.h +index 094d407..2dccf34 100644 +--- a/common/jack/types.h ++++ b/common/jack/types.h +@@ -403,10 +403,8 @@ typedef void (*JackPortConnectCallback)(jack_port_id_t a, jack_port_id_t b, int + * @param port the port that has been renamed + * @param new_name the new name + * @param arg pointer to a client supplied structure +- * +- * @return zero on success, non-zero on error + */ +-typedef int (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); ++typedef void (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); + + /** + * Prototype for the client supplied function that is called +diff --git a/tests/test.cpp b/tests/test.cpp +index 750d152..8a8a811 100644 +--- a/tests/test.cpp ++++ b/tests/test.cpp +@@ -186,11 +186,10 @@ void Jack_Client_Registration_Callback(const char* name, int val, void *arg) + client_register--; + } + +-int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) ++void Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) + { + Log("Rename callback has been successfully called with old_name '%s' and new_name '%s'. (msg from callback)\n", old_name, new_name); + port_rename_clbk = 1; +- return 0; + } + + int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg) Copied: jack2/repos/community-testing-x86_64/40-hpet-permissions.rules (from rev 160347, jack2/trunk/40-hpet-permissions.rules) =================================================================== --- community-testing-x86_64/40-hpet-permissions.rules (rev 0) +++ community-testing-x86_64/40-hpet-permissions.rules 2016-02-04 21:03:54 UTC (rev 160348) @@ -0,0 +1,2 @@ +KERNEL=="rtc0", GROUP="audio" +KERNEL=="hpet", GROUP="audio" Copied: jack2/repos/community-testing-x86_64/99-audio.conf (from rev 160347, jack2/trunk/99-audio.conf) =================================================================== --- community-testing-x86_64/99-audio.conf (rev 0) +++ community-testing-x86_64/99-audio.conf 2016-02-04 21:03:54 UTC (rev 160348) @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited Copied: jack2/repos/community-testing-x86_64/PKGBUILD (from rev 160347, jack2/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2016-02-04 21:03:54 UTC (rev 160348) @@ -0,0 +1,134 @@ +# $Id$ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: Daniele Paolella <danielepaole...@email.it> +# Contributor: Philipp Überbacher <hollunder at gmx dot at> +# Contributor: Thomas Bahn <thomas-bahn at gmx dot net> + +pkgbase=jack2 +pkgname=('jack2' 'jack2-dbus') +#pkgname= # single build (overrides split) +_tarname=jack +pkgver=1.9.10 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://jackaudio.org/" +backup=(etc/security/limits.d/99-audio.conf) +license=('GPL') +makedepends=('python2-dbus' 'libffado' 'celt' 'opus' 'libsamplerate') +source=("https://dl.dropbox.com/u/28869550/jack-$pkgver.tar.bz2" + '99-audio.conf' + '40-hpet-permissions.rules' + 'jack1compat.diff') +md5sums=('4aeb91d7ae0cabce98355436ed4f217a' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' + '471aad533ff56c5d3cbbf65ce32cadef' + '8c367d60a6375ebacf0d53ad651a0486') + +_isbuild() { + printf "%s\n" ${pkgname[@]} | grep -qx $1 +} + +_pyfix() { + sed -i 's:bin/env python:bin/env python2:' \ + "$pkgdir/usr/bin/jack_control" +} + +_wafconf() { + python2 waf configure --prefix=/usr \ + --alsa \ + --firewire $@ + + # not building with doxygen + # see https://github.com/jackaudio/jack2/issues/22 +} + +prepare() { + cd "$srcdir" + + # Some optimisation bug exists for current GCC + # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 + #export CFLAGS="${CFLAGS/-O[0-9]/-O0}" + #export CXXFLAGS="$CFLAGS" + + # fix doxygen building + # TODO: report upstream, but redundant until github issue 22 resolves + #sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript + + + # see https://bugs.archlinux.org/task/47839 + (cd $_tarname-$pkgver && patch -Np1 -i $srcdir/jack1compat.diff) + + # we may do 2 different builds + cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver +} + +build() { + cd "$srcdir" + + # mixed dbus/classic build + if _isbuild jack2; then + cd $_tarname-$pkgver + msg2 "Running Mixed D-Bus/Classic build" + _wafconf --classic --dbus + python2 waf build $MAKEFLAGS + cd .. + fi + + # dbus-ONLY build + if _isbuild jack2-dbus; then + cd $_tarname-dbus-$pkgver + msg2 "Running D-Bus-only build" + _wafconf --dbus + python2 waf build $MAKEFLAGS + cd .. + fi +} + +package_jack2() { + ! _isbuild jack2 && return 0 + + pkgdesc="The next-generation JACK with SMP support" + depends=('libsamplerate' 'celt' 'opus' 'libffado') + optdepends=('python2-dbus: jack_control') + conflicts=('jack') + provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') + + cd "$srcdir/$_tarname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + # fix for major python transition + _pyfix + + # 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" +} + +package_jack2-dbus() { + ! _isbuild jack2-dbus && return 0 + + pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" + depends=('libsamplerate' 'celt' 'opus' 'libffado') + optdepends=('python2-dbus: jack_control') + conflicts=('jack' 'jack2') + provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') + + cd "$srcdir/$_tarname-dbus-$pkgver" + + python2 waf install --destdir="$pkgdir" + + _pyfix + + 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" +} + +# vim:set ts=2 sw=2 et: Copied: jack2/repos/community-testing-x86_64/jack1compat.diff (from rev 160347, jack2/trunk/jack1compat.diff) =================================================================== --- community-testing-x86_64/jack1compat.diff (rev 0) +++ community-testing-x86_64/jack1compat.diff 2016-02-04 21:03:54 UTC (rev 160348) @@ -0,0 +1,33 @@ +diff --git a/common/jack/types.h b/common/jack/types.h +index 094d407..2dccf34 100644 +--- a/common/jack/types.h ++++ b/common/jack/types.h +@@ -403,10 +403,8 @@ typedef void (*JackPortConnectCallback)(jack_port_id_t a, jack_port_id_t b, int + * @param port the port that has been renamed + * @param new_name the new name + * @param arg pointer to a client supplied structure +- * +- * @return zero on success, non-zero on error + */ +-typedef int (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); ++typedef void (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); + + /** + * Prototype for the client supplied function that is called +diff --git a/tests/test.cpp b/tests/test.cpp +index 750d152..8a8a811 100644 +--- a/tests/test.cpp ++++ b/tests/test.cpp +@@ -186,11 +186,10 @@ void Jack_Client_Registration_Callback(const char* name, int val, void *arg) + client_register--; + } + +-int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) ++void Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) + { + Log("Rename callback has been successfully called with old_name '%s' and new_name '%s'. (msg from callback)\n", old_name, new_name); + port_rename_clbk = 1; +- return 0; + } + + int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg)