summaryrefslogtreecommitdiff
path: root/multilib-testing/jack2-multilib
diff options
context:
space:
mode:
Diffstat (limited to 'multilib-testing/jack2-multilib')
-rw-r--r--multilib-testing/jack2-multilib/40-hpet-permissions.rules2
-rw-r--r--multilib-testing/jack2-multilib/99-audio.conf2
-rw-r--r--multilib-testing/jack2-multilib/PKGBUILD158
-rw-r--r--multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch139
4 files changed, 0 insertions, 301 deletions
diff --git a/multilib-testing/jack2-multilib/40-hpet-permissions.rules b/multilib-testing/jack2-multilib/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9..000000000
--- a/multilib-testing/jack2-multilib/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/multilib-testing/jack2-multilib/99-audio.conf b/multilib-testing/jack2-multilib/99-audio.conf
deleted file mode 100644
index eb76ef920..000000000
--- a/multilib-testing/jack2-multilib/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio - rtprio 99
-@audio - memlock unlimited
diff --git a/multilib-testing/jack2-multilib/PKGBUILD b/multilib-testing/jack2-multilib/PKGBUILD
deleted file mode 100644
index e5b3d3b47..000000000
--- a/multilib-testing/jack2-multilib/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id: PKGBUILD 76737 2012-09-28 17:05:26Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-# This one is in response to a need for an equivalent to lib32-jack for
-# jack2. A lib32-jack2 would require much patching and invading the pure
-# jack2 package, and what's more, the buildsystem provides a flag just to
-# build a hybrid jack2 in full. As such, we have opted to provide multilib
-# users with a replacement package instead of the usual lib32 add-on.
-#
-# See http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html
-
-pkgbase=jack2-multilib
-pkgname=('jack2-multilib' 'jack2-dbus-multilib')
-#pkgname= # single build (overrides split)
-_tarname=jack
-pkgver=1.9.8
-pkgrel=4
-arch=('x86_64')
-url="http://jackaudio.org/"
-backup=(etc/security/limits.d/99-audio.conf)
-license=('GPL')
-makedepends=('python2' 'doxygen' 'libffado'
- 'libsamplerate' 'lib32-dbus-core' 'lib32-celt'
- 'gcc-multilib')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
- '99-audio.conf'
- '40-hpet-permissions.rules'
- 'ffado_setbuffsize-jack2.patch')
-md5sums=('1dd2ff054cab79dfc11d134756f27165'
- 'ae65b7c9ebe0fff6c918ba9d97ae342d'
- '471aad533ff56c5d3cbbf65ce32cadef'
- '1502d82fe2276d6f224fff6467a0b6f9')
-
-_pyfix() {
- sed -i 's:bin/env python:bin/env python2:' \
- "$pkgdir/usr/bin/jack_control"
-}
-
-_wafconf() {
- python2 waf configure --prefix=/usr \
- --alsa \
- --firewire \
- --mixed \
- --doxygen $@
-}
-
-_isbuild() {
- printf "%s\n" ${pkgname[@]} | grep -qx $1
-}
-
-_mklinks() {
- ln -s /usr/lib32/libjack.so.0.1.0 "$pkgdir/usr/lib32/libjack.so.0"
- ln -s /usr/lib32/libjack.so.0 "$pkgdir/usr/lib32/libjack.so"
-}
-
-build() {
- cd "$srcdir/$_tarname-$pkgver"
-
- export LINKFLAGS="$LDFLAGS"
-
- # 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"
- )
-
- # 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
- sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
-
- # we may do 2 different builds
- cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
-
- # mixed dbus/classic build
- if _isbuild jack2-multilib; 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-multilib; then
- cd $_tarname-dbus-$pkgver
- msg2 "Running D-Bus-only build"
- _wafconf --dbus
- python2 waf build $MAKEFLAGS
- cd ..
- fi
-}
-
-package_jack2-multilib() {
- ! _isbuild jack2-multilib && return 0
-
- pkgdesc="The next-generation JACK with SMP support & mixed mode"
- depends=('libsamplerate' 'lib32-celt' 'lib32-gcc-libs')
- optdepends=('libffado: FireWire support'
- 'lib32-dbus-core: jackdbus'
- 'python2: jack_control')
- conflicts=('jack' 'jack2' 'lib32-jack')
- provides=('jack' 'jackmp' 'jackdmp' 'jackdbus'
- 'jack2' 'lib32-jack' 'lib32-jack2')
-
- cd "$srcdir/$_tarname-$pkgver/$_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"
-
- # should be done by upstream
- # see http://trac.jackaudio.org/ticket/200
- _mklinks
-}
-
-package_jack2-dbus-multilib() {
- ! _isbuild jack2-dbus-multilib && return 0
-
- pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)"
- depends=('libsamplerate' 'lib32-celt' 'lib32-dbus-core' 'lib32-gcc-libs')
- optdepends=('libffado: FireWire support'
- 'python2: jack_control')
- conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib')
- provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus'
- 'jack2-dbus' 'jack2-multilib' 'lib32-jack' 'lib32-jack2')
-
- cd "$srcdir/$_tarname-$pkgver/$_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"
-
- _mklinks
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch b/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch
deleted file mode 100644
index 0c74aad24..000000000
--- a/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001
-From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
-Date: Sat, 17 Mar 2012 22:36:30 +0100
-Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size
-
-This is a port of Jonathan Woithe's patch from jackd1.
-With sufficiently recent versions of FFADO, it allows to change
-the buffersize at runtime.
----
- linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++----
- linux/firewire/JackFFADODriver.h | 6 ++++
- 2 files changed, 65 insertions(+), 6 deletions(-)
-
-diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
-index b33e1cd..085b78a 100644
---- a/linux/firewire/JackFFADODriver.cpp
-+++ b/linux/firewire/JackFFADODriver.cpp
-@@ -3,6 +3,7 @@
- Copyright (C) 2004 Grame
- Copyright (C) 2007 Pieter Palmers
- Copyright (C) 2009 Devin Anderson
-+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -48,7 +49,10 @@
- namespace Jack
- {
-
-+// Basic functionality requires API version 8. If version 9 or later
-+// is present the buffers can be resized at runtime.
- #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
-+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
-
- #define jack_get_microseconds GetMicroSeconds
-
-@@ -281,19 +285,68 @@
- int
- JackFFADODriver::SetBufferSize (jack_nframes_t nframes)
- {
-- printError("Buffer size change requested but not supported!!!");
-+ ffado_driver_t* driver = (ffado_driver_t*)fDriver;
-+ signed int chn;
-+
-+ // The speed of this function isn't critical; we can afford the
-+ // time to check the FFADO API version.
-+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
-+ ffado_streaming_set_period_size == NULL) {
-+ printError("unsupported on current version of FFADO; please upgrade FFADO");
-+ return -1;
-+ }
-
-- /*
- driver->period_size = nframes;
- driver->period_usecs =
- (jack_time_t) floor ((((float) nframes) / driver->sample_rate)
- * 1000000.0f);
-- */
-+
-+
-+ // Reallocate the null and scratch buffers.
-+ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+ if(driver->nullbuffer == NULL) {
-+ printError("could not allocate memory for null buffer");
-+ return -1;
-+ }
-+ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+ if(driver->scratchbuffer == NULL) {
-+ printError("could not allocate memory for scratch buffer");
-+ return -1;
-+ }
-+
-+ // MIDI buffers need reallocating
-+ for (chn = 0; chn < driver->capture_nchannels; chn++) {
-+ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
-+ // setup the midi buffer
-+ if (driver->capture_channels[chn].midi_buffer != NULL)
-+ free(driver->capture_channels[chn].midi_buffer);
-+ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+ }
-+ }
-+ for (chn = 0; chn < driver->playback_nchannels; chn++) {
-+ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
-+ if (driver->playback_channels[chn].midi_buffer != NULL)
-+ free(driver->playback_channels[chn].midi_buffer);
-+ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+ }
-+ }
-+
-+ // Notify FFADO of the period size change
-+ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
-+ printError("could not alter FFADO device period size");
-+ return -1;
-+ }
-+
-+ // This is needed to give the shadow variables a chance to
-+ // properly update to the changes.
-+ sleep(1);
-
- /* tell the engine to change its buffer size */
-- //driver->engine->set_buffer_size (driver->engine, nframes);
-+ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails
-
-- return -1; // unsupported
-+ UpdateLatencies();
-+
-+ return 0;
- }
-
- typedef void (*JackDriverFinishFunction) (jack_driver_t *);
-@@ -306,7 +359,7 @@
-
- assert(params);
-
-- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
- printError("Incompatible libffado version! (%s)", ffado_get_version());
- return NULL;
- }
-diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h
-index cb2a45d..790f4dd 100644
---- a/linux/firewire/JackFFADODriver.h
-+++ b/linux/firewire/JackFFADODriver.h
-@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver
- int Read();
- int Write();
-
-+ // BufferSize can be changed
-+ bool IsFixedBufferSize()
-+ {
-+ return false;
-+ }
-+
- int SetBufferSize(jack_nframes_t nframes);
- };
-
---
-1.7.10
-
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-05 11:09:31 +0000